X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fmainloop.c;h=9ee2075784fa5c8420cad8224141fdc067419574;hb=96f9db0d0c0ef9073be894162e5c6ea2db726b44;hp=041c67f4e39b5aba24e18cf85d0be65655c263d2;hpb=48d0d4268589454a7c40917ea694a62dbbd56d90;p=chaz%2Fopenbox

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 041c67f4..9ee20757 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -566,18 +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;
 	}
@@ -591,7 +598,7 @@ 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);