summaryrefslogtreecommitdiff
path: root/usr.bin/tmux
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2012-10-25 11:16:54 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2012-10-25 11:16:54 +0000
commit45786641db8625eeb0e3da4846588551a0fd1c8e (patch)
tree692195ef4452afb937ddee78e80625b799cf41c2 /usr.bin/tmux
parent1d40e874919b59912a0eac05e90b0e245ecd04d8 (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 'usr.bin/tmux')
-rw-r--r--usr.bin/tmux/server-window.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/tmux/server-window.c b/usr.bin/tmux/server-window.c
index 7086d0ec3ff..eb54a0f73b8 100644
--- a/usr.bin/tmux/server-window.c
+++ b/usr.bin/tmux/server-window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-window.c,v 1.26 2012/07/10 11:53:01 nicm Exp $ */
+/* $OpenBSD: server-window.c,v 1.27 2012/10/25 11:16:53 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -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)