circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2016-10-25 10:01:09 +01:00
parent 5f9ba2f223 99946aaaaf
commit f523fddf6a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
alerts.c
View File

@ -233,10 +233,11 @@ alerts_check_activity(struct window *w)
if (wl->flags & WINLINK_ACTIVITY) if (wl->flags & WINLINK_ACTIVITY)
continue; continue;
s = wl->session; s = wl->session;
if (s->curw != wl) { if (s->curw == wl)
wl->flags |= WINLINK_ACTIVITY; continue;
notify_winlink("alert-activity", s, wl);
} wl->flags |= WINLINK_ACTIVITY;
notify_winlink("alert-activity", s, wl);
if (s->flags & SESSION_ALERTED) if (s->flags & SESSION_ALERTED)
continue; continue;
@ -269,10 +270,10 @@ alerts_check_silence(struct window *w)
if (wl->flags & WINLINK_SILENCE) if (wl->flags & WINLINK_SILENCE)
continue; continue;
s = wl->session; s = wl->session;
if (s->curw != wl) { if (s->curw == wl)
wl->flags |= WINLINK_SILENCE; continue;
notify_winlink("alert-silence", s, wl); wl->flags |= WINLINK_SILENCE;
} notify_winlink("alert-silence", s, wl);
if (s->flags & SESSION_ALERTED) if (s->flags & SESSION_ALERTED)
continue; continue;