[Galago-commits] r1982 - in trunk/notification-daemon: . src

[galago-commits at freedesktop.org]

Author: chipx86
Date: 2005-06-24 20:57:08 -0700 (Fri, 24 Jun 2005)
New Revision: 1982

Modified:
   trunk/notification-daemon/ChangeLog
   trunk/notification-daemon/src/BaseNotification.cpp
Log:
Patch #2949 by Duarte Henriques to fix a crash on notification timeout.


Modified: trunk/notification-daemon/ChangeLog
===================================================================
--- trunk/notification-daemon/ChangeLog	2005-06-25 03:51:34 UTC (rev 1981)
+++ trunk/notification-daemon/ChangeLog	2005-06-25 03:57:08 UTC (rev 1982)
@@ -1,3 +1,9 @@
+Fri Jun 24 20:55:54 PDT 2005  Christian Hammond <chipx86 at chipx86.com>
+
+	* src/BaseNotification.cpp:
+	  - Patch #2949 by Duarte Henriques to fix a crash on notification
+	    timeout.
+
 Fri Jun 24 20:49:06 PDT 2005  Christian Hammond <chipx86 at chipx86.com>
 
 	* src/main.cpp:

Modified: trunk/notification-daemon/src/BaseNotification.cpp
===================================================================
--- trunk/notification-daemon/src/BaseNotification.cpp	2005-06-25 03:51:34 UTC (rev 1981)
+++ trunk/notification-daemon/src/BaseNotification.cpp	2005-06-25 03:57:08 UTC (rev 1982)
@@ -109,7 +109,10 @@
     {
         if (i->second->use_timeout) needed = true;
 
-        if (i->second->use_timeout && (i->second->timeout <= now)) unnotify(i->second);
+        if (i->second->use_timeout && (i->second->timeout <= now)) {
+            unnotify(i->second);
+            break;
+        }
     }
 
     TRACE("heartbeat: %d, %d notifications left\n", now, notifications.size());