X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fmainloop.c;h=9ee2075784fa5c8420cad8224141fdc067419574;hb=1f451f5de0906cd754419e04407ad6ea4d1e87ef;hp=397f8ae21a4aced2ad6b1949abb9b9bcc59f08fa;hpb=1df4e327607f7dcf56826928efdddb809d8f1fc3;p=chaz%2Fopenbox

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 397f8ae2..9ee20757 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -566,16 +566,25 @@ static gboolean nearest_timeout_wait(ObMainLoop *loop, GTimeVal *tm)
 
 static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
 {
+    GSList *it, *next;
+
+    gboolean fired = FALSE;
+
     g_get_current_time(&loop->now);
 
-    while (loop->timers != NULL) {
-	ObMainLoopTimer *curr = loop->timers->data; /* get the top element */
+    for (it = loop->timers; it; it = next) {
+	ObMainLoopTimer *curr;
+        
+        next = g_slist_next(it);
+
+	curr = it->data;
+
 	/* since timer_stop doesn't actually free the timer, we have to do our
 	   real freeing in here.
 	*/
 	if (curr->del_me) {
             /* delete the top */
-	    loop->timers = g_slist_delete_link(loop->timers, loop->timers); 
+	    loop->timers = g_slist_delete_link(loop->timers, it); 
 	    g_free(curr);
 	    continue;
 	}
@@ -589,24 +598,27 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
 	   then re-insert.  timers maintain their order and may trigger more
 	   than once if they've waited more than one delay's worth of time.
 	*/
-	loop->timers = g_slist_delete_link(loop->timers, loop->timers);
+	loop->timers = g_slist_delete_link(loop->timers, it);
 	g_time_val_add(&curr->last, curr->delay);
 	if (curr->func(curr->data)) {
             g_time_val_add(&curr->timeout, curr->delay);
             insert_timer(loop, curr);
-        } else if (curr->destroy) {
-            curr->destroy(curr->data);
+        } else {
+            if (curr->destroy)
+                curr->destroy(curr->data);
+            g_free(curr);
         }
 
+        fired = TRUE;
+    }
+
+    if (fired) {
 	/* if at least one timer fires, then don't wait on X events, as there
 	   may already be some in the queue from the timer callbacks.
 	*/
 	loop->ret_wait.tv_sec = loop->ret_wait.tv_usec = 0;
 	*wait = &loop->ret_wait;
-	return;
-    }
-
-    if (nearest_timeout_wait(loop, &loop->ret_wait))
+    } else if (nearest_timeout_wait(loop, &loop->ret_wait))
 	*wait = &loop->ret_wait;
     else
 	*wait = NULL;