Merge pull request #352 from bebehei/nextiter

Optimize check_timeouts
This commit is contained in:
Nikos Tsipinakis 2017-08-15 11:49:45 +03:00 committed by GitHub
commit 99c74b8703

View File

@ -57,8 +57,8 @@ void check_timeouts(void)
if (displayed->length == 0) if (displayed->length == 0)
return; return;
for (GList * iter = g_queue_peek_head_link(displayed); iter; GList *iter = g_queue_peek_head_link(displayed);
iter = iter->next) { while (iter) {
notification *n = iter->data; notification *n = iter->data;
/* don't timeout when user is idle */ /* don't timeout when user is idle */
@ -72,12 +72,12 @@ void check_timeouts(void)
continue; continue;
} }
/* shift iter before we possibly delete the current notification */
iter = iter->next;
/* remove old message */ /* remove old message */
if (difftime(time(NULL), n->start) > n->timeout) { if (difftime(time(NULL), n->start) > n->timeout) {
/* close_notification may conflict with iter, so restart */
notification_close(n, 1); notification_close(n, 1);
check_timeouts();
return;
} }
} }
} }