circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-05 10:28:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2015-09-21 12:01:11 +01:00
commit d6d05883ad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
alerts.c
View File

@ -126,6 +126,9 @@ alerts_reset(struct window *w)
void void
alerts_queue(struct window *w, int flags) alerts_queue(struct window *w, int flags)
{ {
if (w->flags & WINDOW_ACTIVITY)
alerts_reset(w);
if (!event_initialized(&w->alerts_timer)) if (!event_initialized(&w->alerts_timer))
evtimer_set(&w->alerts_timer, alerts_timer, w); 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); event_once(-1, EV_TIMEOUT, alerts_callback, NULL, NULL);
alerts_fired = 1; alerts_fired = 1;
} }
if (flags & WINDOW_ACTIVITY)
alerts_reset(w);
} }
int int