diff options
| author | Thomas Adam <thomas@xteddy.org> | 2016-10-25 10:01:09 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2016-10-25 10:01:09 +0100 |
| commit | f523fddf6a5f19e769e21add6632094265819e55 (patch) | |
| tree | 40027cf5b89190676b43b421f31b51ddacd72cbc | |
| parent | 5f9ba2f223bcdc4770e56248d5f20e488ee11456 (diff) | |
| parent | 99946aaaafcd0fb38dd73f750739bb58f6822ed2 (diff) | |
| download | rtmux-f523fddf6a5f19e769e21add6632094265819e55.tar.gz rtmux-f523fddf6a5f19e769e21add6632094265819e55.tar.bz2 rtmux-f523fddf6a5f19e769e21add6632094265819e55.zip | |
Merge branch 'obsd-master'
| -rw-r--r-- | alerts.c | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -233,10 +233,11 @@ alerts_check_activity(struct window *w) if (wl->flags & WINLINK_ACTIVITY) continue; s = wl->session; - if (s->curw != wl) { - wl->flags |= WINLINK_ACTIVITY; - notify_winlink("alert-activity", s, wl); - } + if (s->curw == wl) + continue; + + wl->flags |= WINLINK_ACTIVITY; + notify_winlink("alert-activity", s, wl); if (s->flags & SESSION_ALERTED) continue; @@ -269,10 +270,10 @@ alerts_check_silence(struct window *w) if (wl->flags & WINLINK_SILENCE) continue; s = wl->session; - if (s->curw != wl) { - wl->flags |= WINLINK_SILENCE; - notify_winlink("alert-silence", s, wl); - } + if (s->curw == wl) + continue; + wl->flags |= WINLINK_SILENCE; + notify_winlink("alert-silence", s, wl); if (s->flags & SESSION_ALERTED) continue; |