X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=openbox%2Fmainloop.c;h=4dce047ee9dd79cc48aa9f56e687067988591ffb;hb=9decfe0d76d661ded94eced1f03c2ebfa2941bcc;hp=6061a4606f50902e7f242d378b768e084015b326;hpb=70a31e890435d57f02d5e95a4a09216e23eabd1b;p=chaz%2Fopenbox diff --git a/openbox/mainloop.c b/openbox/mainloop.c index 6061a460..4dce047e 100644 --- a/openbox/mainloop.c +++ b/openbox/mainloop.c @@ -595,7 +595,9 @@ static void timer_dispatch(ObMainLoop *loop, GTimeVal **wait) g_time_val_add(&curr->timeout, curr->delay); insert_timer(loop, curr); } else { - curr->del_me = TRUE; + if (curr->destroy) + curr->destroy(curr->data); + g_free(curr); } /* if at least one timer fires, then don't wait on X events, as there