The alerts callback should be fired for bells even if bell-action is

none because it also affects the status line bell indicator (and
bell-action does not). Fixes a problem reported by tim@.

1 files changed, 2 insertions, 10 deletions

diff --git a/alerts.c b/alerts.c
index e08b183d..55e7044d 100644
--- a/alerts.c
+++ b/alerts.c
@@ -77,8 +77,8 @@ alerts_callback(__unused int fd, __unused short events, __unused void *arg)
 int
 alerts_enabled(struct window *w, int flags)
 {
-	struct session	*s;
-
+	if (flags & WINDOW_BELL)
+		return (1);
 	if (flags & WINDOW_ACTIVITY) {
 		if (options_get_number(w->options, "monitor-activity"))
 			return (1);
@@ -87,14 +87,6 @@ alerts_enabled(struct window *w, int flags)
 		if (options_get_number(w->options, "monitor-silence") != 0)
 			return (1);
 	}
-	if (~flags & WINDOW_BELL)
-		return (0);
-	RB_FOREACH(s, sessions, &sessions) {
-		if (!session_has(s, w))
-			continue;
-		if (options_get_number(s->options, "bell-action") != BELL_NONE)
-			return (1);
-	}
 	return (0);
 }