===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/server-window.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- src/usr.bin/tmux/Attic/server-window.c	2012/07/10 11:53:01	1.26
+++ src/usr.bin/tmux/Attic/server-window.c	2012/10/25 11:16:53	1.27
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-window.c,v 1.26 2012/07/10 11:53:01 nicm Exp $ */
+/* $OpenBSD: server-window.c,v 1.27 2012/10/25 11:16:53 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -75,12 +75,14 @@
 	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)