diff options
| author |   nicm <nicm@openbsd.org> | 2017-07-26 16:16:25 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2017-07-26 16:16:25 +0000 |
| commit | 9a72f1d82d7af7e9f339db491e314d9f89a7e3cb (patch) | |
| tree | cff4c42efc161121a93866adf2ab77b8d1cef0fd | |
| parent | Make bell, activity and silence alerting more consistent: (diff) | |
| download | wireguard-openbsd-9a72f1d82d7af7e9f339db491e314d9f89a7e3cb.tar.xz wireguard-openbsd-9a72f1d82d7af7e9f339db491e314d9f89a7e3cb.zip | |
Always reset the alerts timer so it works even if activity and silence
are enabled on the same window.
| -rw-r--r-- | usr.bin/tmux/alerts.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/tmux/alerts.c b/usr.bin/tmux/alerts.c index 1f2c978f67e..06d5df8af05 100644 --- a/usr.bin/tmux/alerts.c +++ b/usr.bin/tmux/alerts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: alerts.c,v 1.21 2017/07/26 16:14:08 nicm Exp $ */ +/* $OpenBSD: alerts.c,v 1.22 2017/07/26 16:16:25 nicm Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -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); |