summaryrefslogtreecommitdiff
path: root/usr.bin/tmux
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2010-07-19 21:13:04 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2010-07-19 21:13:04 +0000
commite1a996cb6f255c254f3ce7a47df203e185f53a29 (patch)
treee7750c74bb780f96a029438dc9dcf0a32236e7c4 /usr.bin/tmux
parentd15a7bd4e04de9a8aea8cf60c4049fecf05ff53f (diff)
Don't return if in the current window since we may want to report a bell
(if bell-action any/current), just clear the flag so the status line doesn't show the bell.
Diffstat (limited to 'usr.bin/tmux')
-rw-r--r--usr.bin/tmux/server-window.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/tmux/server-window.c b/usr.bin/tmux/server-window.c
index 3664c8b7317..c2a00c4c46c 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.15 2010/06/21 01:27:46 nicm Exp $ */
+/* $OpenBSD: server-window.c,v 1.16 2010/07/19 21:13:03 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -109,10 +109,8 @@ server_window_check_bell(struct session *s, struct winlink *wl)
if (!(w->flags & WINDOW_BELL) || wl->flags & WINLINK_BELL)
return (0);
- if (s->curw == wl)
- return (0);
-
- wl->flags |= WINLINK_BELL;
+ if (s->curw != wl)
+ wl->flags |= WINLINK_BELL;
action = options_get_number(&s->options, "bell-action");
switch (action) {