From f7d083904fa9b4880c2be352002aaa1b1bd7e3fc Mon Sep 17 00:00:00 2001 From: o9000 Date: Fri, 17 Nov 2017 15:40:48 +0100 Subject: [PATCH] Timer: do not clear timers restarted from their own callback function - fix check --- src/util/timer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/timer.c b/src/util/timer.c index 60491a0..03a6f84 100644 --- a/src/util/timer.c +++ b/src/util/timer.c @@ -162,10 +162,10 @@ void handle_expired_timers() t->expired = t->interval_msec == 0; t->reactivated = FALSE; t->_callback(t->arg); - if (!t->reactivated) { - // If _callback() calls stop_timeout(t) the timer 't' was freed and is not in the timeout_list - if (g_slist_find(timeout_list, t)) { - // Timer still exists + // If _callback() calls stop_timeout(t) the timer 't' was freed and is not in the timeout_list + if (g_slist_find(timeout_list, t)) { + // Timer still exists + if (!t->reactivated) { timeout_list = g_slist_remove(timeout_list, t); if (t->interval_msec > 0) { add_timeout_intern(t->interval_msec, t->interval_msec, t->_callback, t->arg, t);