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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/dataengines/notifications
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-04-29 20:17:16
Message-ID: 1241036236.736775.28356.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 961272 by aseigo:

don't crash in the event we start up after the initial notification but before the update!


 M  +2 -1      notificationsengine.cpp  


--- trunk/KDE/kdebase/workspace/plasma/dataengines/notifications/notificationsengine.cpp #961271:961272
@@ -65,13 +65,14 @@
     QString source = QString("notification %1").arg(id);
     if (replaces_id) {
         Plasma::DataContainer *container = containerForSource(source);
-        if (container->data()["expireTimeout"].toInt() != timeout) {
+        if (container && container->data()["expireTimeout"].toInt() != timeout) {
             int timerId = m_sourceTimers.value(source);
             killTimer(timerId);
             m_sourceTimers.remove(source);
             m_timeouts.remove(timerId);
         }
     }
+
     Plasma::DataEngine::Data notificationData;
     notificationData.insert("id", QString::number(id));
     notificationData.insert("appName", appname_str);
[prev in list] [next in list] [prev in thread] [next in thread]