diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-09-23 14:27:11 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-09-23 14:27:11 +0100 |
| commit | 06d4553a15db5b7b018e0d5a97a355ca341b0168 (patch) | |
| tree | ed57a8dfd5d5703dc526142db5028089aebb49b4 /alerts.c | |
| parent | 1caebaa49a0a418b21724c3651e993224bfc12eb (diff) | |
| parent | 7e9b87f396e117828c0db9dd53f4b01a82f35640 (diff) | |
| download | rtmux-06d4553a15db5b7b018e0d5a97a355ca341b0168.tar.gz rtmux-06d4553a15db5b7b018e0d5a97a355ca341b0168.tar.bz2 rtmux-06d4553a15db5b7b018e0d5a97a355ca341b0168.zip | |
Merge branch 'master' of github.com:tmux/tmux
Diffstat (limited to 'alerts.c')
| -rw-r--r-- | alerts.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -126,6 +126,9 @@ alerts_reset(struct window *w) void alerts_queue(struct window *w, int flags) { + if (w->flags & WINDOW_ACTIVITY) + alerts_reset(w); + if (!event_initialized(&w->alerts_timer)) evtimer_set(&w->alerts_timer, alerts_timer, w); @@ -139,9 +142,6 @@ alerts_queue(struct window *w, int flags) event_once(-1, EV_TIMEOUT, alerts_callback, NULL, NULL); alerts_fired = 1; } - - if (flags & WINDOW_ACTIVITY) - alerts_reset(w); } int |