From: Dana Jansens <danakj@orodu.net>
Date: Sun, 14 Sep 2003 04:40:09 +0000 (+0000)
Subject: fix a memory leak in the mainloop timers
X-Git-Tag: openbox-3_0-rc1-RELEASE~268
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=70a31e890435d57f02d5e95a4a09216e23eabd1b;p=dana%2Fopenbox.git

fix a memory leak in the mainloop timers
---

diff --git a/openbox/mainloop.c b/openbox/mainloop.c
index 397f8ae2..6061a460 100644
--- a/openbox/mainloop.c
+++ b/openbox/mainloop.c
@@ -594,8 +594,8 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait)
 	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 {
+            curr->del_me = TRUE;
         }
 
 	/* if at least one timer fires, then don't wait on X events, as there