diff options
| author | Thomas Adam <thomas@xteddy.org> | 2012-10-25 23:32:14 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2012-10-25 23:32:14 +0100 |
| commit | 31f93d84458dca70b94f1b20fa67f64e08e05305 (patch) | |
| tree | 5de46ff0fd8ef69a941d6a221fd9f59ea3461698 /server-window.c | |
| parent | d4dc52ec8451c51b8566ebbcfdb2210a556facdc (diff) | |
| parent | 2a609b332f6cdc2ef6f3ffb525a3c74ada738ec4 (diff) | |
| download | rtmux-31f93d84458dca70b94f1b20fa67f64e08e05305.tar.gz rtmux-31f93d84458dca70b94f1b20fa67f64e08e05305.tar.bz2 rtmux-31f93d84458dca70b94f1b20fa67f64e08e05305.zip | |
Merge branch 'obsd-master'
Sync from OpenBSD.
Diffstat (limited to 'server-window.c')
| -rw-r--r-- | server-window.c | 4 |
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) |