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

List:       kde-commits
Subject:    kdebase/kicker/applets/clock
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2005-02-21 5:14:44
Message-ID: 20050221051444.2A43B1B7CE () office ! kde ! org
[Download RAW message or body]

CVS commit by aseigo: 

don't crash when datepicker showing and we are removed.
BUG:99743


  M +7 -2      clock.cpp   1.204


--- kdebase/kicker/applets/clock/clock.cpp  #1.203:1.204
@@ -909,9 +909,14 @@ ClockApplet::~ClockApplet()
     KGlobal::locale()->removeCatalogue("timezones"); // For time zone translations
 
+    if (_calendar)
+    {
+        // we have to take care of the calendar closing first before deleting
+        // the prefs
+        _calendar->close();
+    }
+
     delete _prefs; _prefs = 0;
     delete zone; zone = 0;
     delete menu; menu = 0;
-    if (_calendar)
-        _calendar->close();
     config()->sync();
 }


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