aboutsummaryrefslogtreecommitdiff
path: root/server-window.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2012-11-22 16:48:50 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2012-11-22 16:48:50 +0000
commit63f451965cf26bf6baadc374bd0dcadc8ca66308 (patch)
treeac3b5f838273eed3271e04b4132fb22807705c42 /server-window.c
parent60808bbdede5c489a1faa6671999a92a67b28024 (diff)
parentc04aa9020782fe0a944db2adf5a03e9f52618bea (diff)
downloadrtmux-63f451965cf26bf6baadc374bd0dcadc8ca66308.tar.gz
rtmux-63f451965cf26bf6baadc374bd0dcadc8ca66308.tar.bz2
rtmux-63f451965cf26bf6baadc374bd0dcadc8ca66308.zip
Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux
Diffstat (limited to 'server-window.c')
-rw-r--r--server-window.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/server-window.c b/server-window.c
index 72203201..fce6439b 100644
--- a/server-window.c
+++ b/server-window.c
@@ -75,12 +75,14 @@ server_window_check_bell(struct session *s, struct winlink *wl)
if (s->curw != wl || s->flags & SESSION_UNATTACHED)
wl->flags |= WINLINK_BELL;
if (s->flags & SESSION_UNATTACHED)
- return (1);
+ return (0);
if (s->curw->window == wl->window)
w->flags &= ~WINDOW_BELL;
visual = options_get_number(&s->options, "visual-bell");
action = options_get_number(&s->options, "bell-action");
+ if (action == BELL_NONE)
+ return (0);
for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
c = ARRAY_ITEM(&clients, i);
if (c == NULL || c->session != s)