Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Timer: do not clear timers restarted from their own callback function - fix check

Browse Source
This commit is contained in:
o9000
2017-11-17 15:40:48 +01:00
parent f11d30f076
commit f7d083904f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/timer.c
View File

@@ -162,10 +162,10 @@ void handle_expired_timers()
t->expired = t->interval_msec == 0; t->expired = t->interval_msec == 0;
t->reactivated = FALSE; t->reactivated = FALSE;
t->_callback(t->arg); 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 _callback() calls stop_timeout(t) the timer 't' was freed and is not in the timeout_list if (g_slist_find(timeout_list, t)) {
if (g_slist_find(timeout_list, t)) { // Timer still exists
// Timer still exists if (!t->reactivated) {
timeout_list = g_slist_remove(timeout_list, t); timeout_list = g_slist_remove(timeout_list, t);
if (t->interval_msec > 0) { if (t->interval_msec > 0) {
add_timeout_intern(t->interval_msec, t->interval_msec, t->_callback, t->arg, t); add_timeout_intern(t->interval_msec, t->interval_msec, t->_callback, t->arg, t);