Update of /cvsroot/mahogany/M/src/classes
In directory usw-pr-cvs1:/tmp/cvs-serv12330/src/classes
Modified Files:
Profile.cpp MApplication.cpp
Log Message:
removed the stupid hack preventing the global profile from being deleted normally
Index: Profile.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/Profile.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -b -u -2 -r1.130 -r1.131
--- Profile.cpp 22 Apr 2002 16:35:32 -0000 1.130
+++ Profile.cpp 22 Apr 2002 17:06:54 -0000 1.131
@@ -1059,5 +1059,4 @@
{
PCHECK();
- ASSERT(this != mApplication->GetProfile());
if ( m_Suspended )
@@ -1068,5 +1067,6 @@
}
- if(m_Identity) m_Identity->DecRef();
+ if(m_Identity)
+ m_Identity->DecRef();
}
Index: MApplication.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/classes/MApplication.cpp,v
retrieving revision 1.252
retrieving revision 1.253
diff -b -u -2 -r1.252 -r1.253
--- MApplication.cpp 22 Apr 2002 16:35:14 -0000 1.252
+++ MApplication.cpp 22 Apr 2002 17:06:55 -0000 1.253
@@ -644,10 +644,6 @@
if ( m_profile )
{
- // The following little hack allows us to decref and delete the
- // global profile without triggering an assert, as this is not
- // normally allowed.
- Profile *p = m_profile;
+ m_profile->DecRef();
m_profile = NULL;
- p->DecRef();
}
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
