summaryrefslogtreecommitdiffstats
path: root/server-window.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2012-10-25 11:16:53 +0000
committerNicholas Marriott <nicm@openbsd.org>2012-10-25 11:16:53 +0000
commit18236c1c1bd9afc994971fe2806dac905242be98 (patch)
tree03989b2b7d38fe8b9cdcd99a3cf73cc91e0ed59c /server-window.c
parent596e9d80681cf77459dd31f084daa468a766a9d8 (diff)
Fix BELL_NONE which had been broken in some code reorganisation or other
also don't redraw unnecessarily. From Seiji Ohashi.
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 8f3e2b63..8b34fc6c 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)