aboutsummaryrefslogtreecommitdiff
path: root/server-window.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2014-04-15 00:33:56 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2014-04-15 00:33:56 +0100
commit4abc8f717a5a786a4dd9e4f24d64ec76b0829993 (patch)
treed52bbbd572c1fb638ac60e75a43d92ede1955155 /server-window.c
parent8e1cef404022422f9f57c72d139f19a82a70a791 (diff)
parent57c514d2f85f9d1c81601bae32131f1cd2948422 (diff)
downloadrtmux-4abc8f717a5a786a4dd9e4f24d64ec76b0829993.tar.gz
rtmux-4abc8f717a5a786a4dd9e4f24d64ec76b0829993.tar.bz2
rtmux-4abc8f717a5a786a4dd9e4f24d64ec76b0829993.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'server-window.c')
-rw-r--r--server-window.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/server-window.c b/server-window.c
index 687d4239..900060b5 100644
--- a/server-window.c
+++ b/server-window.c
@@ -85,10 +85,11 @@ server_window_check_bell(struct session *s, struct winlink *wl)
return (0);
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
- if (c == NULL || c->session != s || (c->flags & CLIENT_CONTROL))
+ if (c == NULL || c->session != s || c->flags & CLIENT_CONTROL)
continue;
if (!visual) {
- tty_bell(&c->tty);
+ if (c->session->curw->window == w || action == BELL_ANY)
+ tty_bell(&c->tty);
continue;
}
if (c->session->curw->window == w)