Update of /cvsroot/mahogany/M/src/gui
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv15983/src/gui
Modified Files:
wxMainFrame.cpp
Log Message:
avoid crash due to receiving more than one resume notification under MSW
Index: wxMainFrame.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMainFrame.cpp,v
retrieving revision 1.195
retrieving revision 1.196
diff -b -u -2 -r1.195 -r1.196
--- wxMainFrame.cpp 27 May 2006 16:27:12 -0000 1.195
+++ wxMainFrame.cpp 25 Jun 2006 14:04:37 -0000 1.196
@@ -1123,11 +1123,17 @@
void wxMainFrame::DoResume()
{
- if ( m_foldersToReopen )
- {
+ if ( !m_foldersToReopen )
+ return;
+
+ // copy to a temporary variable to avoid problems in case we get several
+ // resume messages (currently happens under Windows sometimes)
+ MFolderList *foldersToReopen = m_foldersToReopen;
+ m_foldersToReopen = NULL;
+
wxLogStatus(_("Reopening %lu folders"),
- (unsigned long)m_foldersToReopen->size());
+ (unsigned long)foldersToReopen->size());
- for ( MFolderList::iterator i = m_foldersToReopen->begin();
- i != m_foldersToReopen->end();
+ for ( MFolderList::iterator i = foldersToReopen->begin();
+ i != foldersToReopen->end();
++i )
{
@@ -1159,9 +1165,7 @@
}
- delete m_foldersToReopen;
- m_foldersToReopen = NULL;
+ delete foldersToReopen;
m_folderToReopenHere.clear();
- }
}
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Mahogany-cvsupdates mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
