aboutsummaryrefslogtreecommitdiff
path: root/alerts.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-08-17 12:01:17 +0100
committerThomas Adam <thomas@xteddy.org>2017-08-17 12:01:17 +0100
commit07a13697e10af0a4eee1c158cef679be177fb6e7 (patch)
treec5f10966729a6080fb52408b10e354ac24235aa8 /alerts.c
parentde86bf18565c98ff954b8d0ad394bb7085451829 (diff)
parent8daa1d5f547b3933c30fc45d2a80da5016b7dbca (diff)
downloadrtmux-07a13697e10af0a4eee1c158cef679be177fb6e7.tar.gz
rtmux-07a13697e10af0a4eee1c158cef679be177fb6e7.tar.bz2
rtmux-07a13697e10af0a4eee1c158cef679be177fb6e7.zip
Merge branch 'obsd-master'
Diffstat (limited to 'alerts.c')
-rw-r--r--alerts.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/alerts.c b/alerts.c
index 9c9bdf3b..f047acae 100644
--- a/alerts.c
+++ b/alerts.c
@@ -90,8 +90,10 @@ alerts_check_session(struct session *s)
static int
alerts_enabled(struct window *w, int flags)
{
- if (flags & WINDOW_BELL)
- return (1);
+ if (flags & WINDOW_BELL) {
+ if (options_get_number(w->options, "monitor-bell"))
+ return (1);
+ }
if (flags & WINDOW_ACTIVITY) {
if (options_get_number(w->options, "monitor-activity"))
return (1);
@@ -164,6 +166,8 @@ alerts_check_bell(struct window *w)
if (~w->flags & WINDOW_BELL)
return (0);
+ if (!options_get_number(w->options, "monitor-bell"))
+ return (0);
TAILQ_FOREACH(wl, &w->winlinks, wentry)
wl->session->flags &= ~SESSION_ALERTED;