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

List:       kde-commits
Subject:    kdepim/kalarm
From:       David Jarvie <software () astrojar ! org ! uk>
Date:       2004-03-05 2:42:37
Message-ID: 20040305024237.4FBD2990E () office ! kde ! org
[Download RAW message or body]

CVS commit by djarvie: 

Fix crash on quit in earlier versions of KDE


  M +7 -4      traywindow.cpp   1.46


--- kdepim/kalarm/traywindow.cpp  #1.45:1.46
@@ -116,6 +116,6 @@ TrayWindow::~TrayWindow()
 void TrayWindow::contextMenuAboutToShow(KPopupMenu* menu)
 {
-        theApp()->daemonGuiHandler()->checkStatus();
         KSystemTray::contextMenuAboutToShow(menu);     // needed for KDE <= 3.1 compatibility
+        theApp()->daemonGuiHandler()->checkStatus();
 }
 
@@ -127,5 +127,5 @@ void TrayWindow::contextMenuAboutToShow(
 void TrayWindow::slotQuit()
 {
-        kdDebug(5950)<<"TrayWindow::slotQuit()\n";
+        kdDebug(5950) << "TrayWindow::slotQuit()\n";
         if (theApp()->alarmsDisabledIfStopped()
         &&  KMessageBox::warningYesNo(this, i18n("Quitting will disable alarms\n"
@@ -137,6 +137,9 @@ void TrayWindow::slotQuit()
         {
                 if (!MessageWin::instanceCount())
+                {
+                        kdDebug(5950) << "TrayWindow::slotQuit(): quitting\n";
                         theApp()->quit();
-                else
+                        return;
+                }
                         KAlarmMainWindow::closeAll();
         }


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