aboutsummaryrefslogtreecommitdiff
path: root/server-window.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2014-04-05 12:36:14 +0100
committerThomas Adam <thomas@xteddy.org>2014-04-05 12:36:14 +0100
commit0c99c7dbff21082a5f0774e6193b9c9b9a160882 (patch)
tree852fa9fde3126091fa90ee6604097373076772b1 /server-window.c
parent806d5dcb17c26d2abcbf4328a9ec419ada3d4a3f (diff)
parentacef311fe356f408690e9f94727ed63a934b742f (diff)
downloadrtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.gz
rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.bz2
rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.zip
Merge branch 'obsd-master'
Conflicts: Makefile tty-keys.c
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)