===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- src/usr.bin/tmux/tty.c	2012/07/10 11:53:01	1.138
+++ src/usr.bin/tmux/tty.c	2012/08/14 08:58:25	1.139
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.138 2012/07/10 11:53:01 nicm Exp $ */
+/* $OpenBSD: tty.c,v 1.139 2012/08/14 08:58:25 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -667,7 +667,6 @@
 {
 	struct window_pane	*wp = ctx->wp;
 	struct client		*c;
-	struct session		*s;
 	u_int		 	 i;
 
 	/* wp can be NULL if updating the screen but not the terminal. */
@@ -681,25 +680,19 @@
 
 	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
 		c = ARRAY_ITEM(&clients, i);
-		if (c == NULL || c->session == NULL)
+		if (c == NULL || c->session == NULL || c->tty.term == NULL)
 			continue;
-		if (c->flags & CLIENT_SUSPENDED)
+		if (c->flags & (CLIENT_SUSPENDED|TTY_FREEZE))
 			continue;
-		s = c->session;
+		if (c->session->curw->window != wp->window)
+			continue;
 
-		if (s->curw->window == wp->window) {
-			if (c->tty.term == NULL)
-				continue;
-			if (c->tty.flags & TTY_FREEZE)
-				continue;
+		ctx->xoff = wp->xoff;
+		ctx->yoff = wp->yoff;
+		if (status_at_line(c) == 0)
+			ctx->yoff++;
 
-			ctx->xoff = wp->xoff;
-			ctx->yoff = wp->yoff;
-			if (status_at_line(c) == 0)
-				ctx->yoff++;
-
-			cmdfn(&c->tty, ctx);
-		}
+		cmdfn(&c->tty, ctx);
 	}
 }