From a89287cb3e76375bf636764caa2ebec39ecf7d45 Mon Sep 17 00:00:00 2001 From: Nikos Tsipinakis Date: Sun, 13 Dec 2020 22:22:14 +0200 Subject: [PATCH] Check for marked_for_closure before checking for timeout --- src/queues.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/queues.c b/src/queues.c index 01aa2c0..172e92a 100644 --- a/src/queues.c +++ b/src/queues.c @@ -396,17 +396,20 @@ void queues_update(struct dunst_status status) continue; } - if (queues_notification_is_finished(n, status)){ - queues_notification_close(n, REASON_TIME); - iter = nextiter; - continue; - } else if (n->marked_for_closure) { + if (n->marked_for_closure) { queues_notification_close(n, n->marked_for_closure); n->marked_for_closure = 0; iter = nextiter; 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)) { g_queue_delete_link(displayed, iter); g_queue_insert_sorted(waiting, n, notification_cmp_data, NULL);