Update of /cvsroot/mahogany/M/src/gui
In directory usw-pr-cvs1:/tmp/cvs-serv16635/src/gui

Modified Files:
        wxMApp.cpp 
Log Message:
don't crash when the application failed to start up (e.g. because incorrect cmd line 
options were specified

Index: wxMApp.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/gui/wxMApp.cpp,v
retrieving revision 1.228
retrieving revision 1.229
diff -b -u -2 -r1.228 -r1.229
--- wxMApp.cpp  13 Apr 2002 23:34:31 -0000      1.228
+++ wxMApp.cpp  14 Apr 2002 09:32:35 -0000      1.229
@@ -994,8 +994,7 @@
    m_serverIPC = NULL;
 
-   // disable timers for autosave and mail collection, won't need them any more
-   StopTimer(Timer_Autosave);
-   StopTimer(Timer_PollIncoming);
-
+   // if one timer was created, then all of them were
+   if ( gs_timerAutoSave )
+   {
    // delete timers
    delete gs_timerAutoSave;
@@ -1005,4 +1004,6 @@
    gs_timerAutoSave = NULL;
    gs_timerMailCollection = NULL;
+      gs_timerAway = NULL;
+   }
 
    CleanUpPrintData();
@@ -1462,8 +1463,10 @@
    {
       case Timer_Autosave:
+         if ( gs_timerAutoSave )
          gs_timerAutoSave->Stop();
          break;
 
       case Timer_PollIncoming:
+         if ( gs_timerMailCollection )
          gs_timerMailCollection->Stop();
          break;


_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates

Reply via email to