aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-11-19 16:01:12 +0000
committerThomas Adam <thomas@xteddy.org>2015-11-19 16:01:12 +0000
commitcf688db4b5eb9e90d4379f113b509dc8319b731f (patch)
tree8af4d051ea9db1e780d255fe5d9250e831357872
parent45b4e337cb1421721268e4a32f716205338ee6ed (diff)
parent98967c5ec97feef99f8278df9c3b993bbff9c0d5 (diff)
downloadrtmux-cf688db4b5eb9e90d4379f113b509dc8319b731f.tar.gz
rtmux-cf688db4b5eb9e90d4379f113b509dc8319b731f.tar.bz2
rtmux-cf688db4b5eb9e90d4379f113b509dc8319b731f.zip
Merge branch 'obsd-master'
-rw-r--r--alerts.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/alerts.c b/alerts.c
index 32e0d496..e08b183d 100644
--- a/alerts.c
+++ b/alerts.c
@@ -132,15 +132,15 @@ alerts_queue(struct window *w, int flags)
if (!event_initialized(&w->alerts_timer))
evtimer_set(&w->alerts_timer, alerts_timer, w);
- if (w->flags & flags)
- return;
- w->flags |= flags;
- log_debug("@%u alerts flags added %#x", w->id, flags);
-
- if (!alerts_fired && alerts_enabled(w, flags)) {
- log_debug("alerts check queued (by @%u)", w->id);
- event_once(-1, EV_TIMEOUT, alerts_callback, NULL, NULL);
- alerts_fired = 1;
+ if (!alerts_fired) {
+ w->flags |= flags;
+ log_debug("@%u alerts flags added %#x", w->id, flags);
+
+ if (alerts_enabled(w, flags)) {
+ log_debug("alerts check queued (by @%u)", w->id);
+ event_once(-1, EV_TIMEOUT, alerts_callback, NULL, NULL);
+ alerts_fired = 1;
+ }
}
}