diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2010-07-20 17:36:41 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2010-07-20 17:36:41 +0000 |
| commit | 28c4c86589476a0c0d795a20a5b67a4fe8e63c8c (patch) | |
| tree | dfdbf700d6a65d9b6048ad044d935e3b89b5f3fd /server-window.c | |
| parent | 7ed9b0f8fbf71c88a9479cdb64640e73d8a64ef6 (diff) | |
Sync OpenBSD patchset 738:
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 'server-window.c')
| -rw-r--r-- | server-window.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/server-window.c b/server-window.c index 6d76ab4b..dc3464bf 100644 --- a/server-window.c +++ b/server-window.c @@ -1,4 +1,4 @@ -/* $Id: server-window.c,v 1.15 2010-06-22 23:26:18 tcunha Exp $ */ +/* $Id: server-window.c,v 1.16 2010-07-20 17:36:41 tcunha 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) { |