summaryrefslogtreecommitdiff
path: root/openbox/mainloop.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-09-14 04:40:09 +0000
committerDana Jansens <danakj@orodu.net>2003-09-14 04:40:09 +0000
commit70a31e890435d57f02d5e95a4a09216e23eabd1b (patch)
tree74d30f10a5a99c33e01b6697ee9ce94f74c59228 /openbox/mainloop.c
parent4be58bf13719fd22cb08a7f016eaf757640ccd05 (diff)
fix a memory leak in the mainloop timers
Diffstat (limited to 'openbox/mainloop.c')
-rw-r--r--openbox/mainloop.c4
1 files changed, 2 insertions, 2 deletions
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