[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_1_BRANCH: kdebase/kdesktop
From:       Waldo Bastian <bastian () kde ! org>
Date:       2003-04-23 14:40:53
[Download RAW message or body]

CVS commit by waba: 

Make sure that the alarm clock bails us out if we crash inside malloc.


  M +2 -4      main.cc   1.80.2.2


--- kdebase/kdesktop/main.cc  #1.80.2.1:1.80.2.2
@@ -58,6 +58,4 @@ int kdesktop_screen_number = 0;
 static void crashHandler(int sigId)
 {
-    KCrash::setCrashHandler(0); // exit on next crash
-
     DCOPClient::emergencyClose(); // unregister DCOP
     sleep( 1 );
@@ -70,6 +68,6 @@ static void signalHandler(int sigId)
 {
     fprintf(stderr, "*** kdesktop got signal %d (Exiting)\n", sigId);
+    KCrash::setEmergencySaveFunction(0); // No restarts any more
     // try to cleanup all windows
-    KCrash::setCrashHandler(0); // we're quitting now anyway
     signal(SIGTERM, SIG_DFL); // next one kills
     signal(SIGHUP,  SIG_DFL); // next one kills
@@ -152,5 +150,5 @@ int main( int argc, char **argv )
 
     if (getenv("KDE_DEBUG") == NULL)
-        KCrash::setCrashHandler(crashHandler); // Try to restart on crash
+        KCrash::setEmergencySaveFunction(crashHandler); // Try to restart on crash
 
     KCmdLineArgs *args = KCmdLineArgs::parsedArgs();


[prev in list] [next in list] [prev in thread] [next in thread]