From b1bd0c7fc16e896e7432beb56075d501f90ed6b8 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 26 Jul 2017 16:16:25 +0000
Subject: Always reset the alerts timer so it works even if activity and
 silence are enabled on the same window.

---
 alerts.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'alerts.c')

diff --git a/alerts.c b/alerts.c
index afeafb44..790ce38e 100644
--- a/alerts.c
+++ b/alerts.c
@@ -45,7 +45,6 @@ alerts_timer(__unused int fd, __unused short events, void *arg)
 	struct window	*w = arg;
 
 	log_debug("@%u alerts timer expired", w->id);
-	alerts_reset(w);
 	alerts_queue(w, WINDOW_SILENCE);
 }
 
@@ -132,8 +131,7 @@ alerts_reset(struct window *w)
 void
 alerts_queue(struct window *w, int flags)
 {
-	if (w->flags & WINDOW_ACTIVITY)
-		alerts_reset(w);
+	alerts_reset(w);
 
 	if (!event_initialized(&w->alerts_timer))
 		evtimer_set(&w->alerts_timer, alerts_timer, w);
-- 
cgit