Check for marked_for_closure before checking for timeout

This commit is contained in:
Nikos Tsipinakis 2020-12-13 22:22:14 +02:00
parent 8f9e85f122
commit a89287cb3e

View File

@ -396,17 +396,20 @@ void queues_update(struct dunst_status status)
continue; continue;
} }
if (queues_notification_is_finished(n, status)){ if (n->marked_for_closure) {
queues_notification_close(n, REASON_TIME);
iter = nextiter;
continue;
} else if (n->marked_for_closure) {
queues_notification_close(n, n->marked_for_closure); queues_notification_close(n, n->marked_for_closure);
n->marked_for_closure = 0; n->marked_for_closure = 0;
iter = nextiter; iter = nextiter;
continue; continue;
} }
if (queues_notification_is_finished(n, status)){
queues_notification_close(n, REASON_TIME);
iter = nextiter;
continue;
}
if (!queues_notification_is_ready(n, status, true)) { if (!queues_notification_is_ready(n, status, true)) {
g_queue_delete_link(displayed, iter); g_queue_delete_link(displayed, iter);
g_queue_insert_sorted(waiting, n, notification_cmp_data, NULL); g_queue_insert_sorted(waiting, n, notification_cmp_data, NULL);