===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- src/usr.bin/tmux/window.c	2013/03/25 15:59:57	1.96
+++ src/usr.bin/tmux/window.c	2013/03/26 10:54:48	1.97
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.96 2013/03/25 15:59:57 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.97 2013/03/26 10:54:48 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -496,19 +496,18 @@
 int
 window_unzoom(struct window *w)
 {
-	struct window_pane	*wp, *wp1;
+	struct window_pane	*wp;
 
 	if (!(w->flags & WINDOW_ZOOMED))
 		return (-1);
-	wp = w->active;
 
 	w->flags &= ~WINDOW_ZOOMED;
 	layout_free(w);
 	w->layout_root = w->saved_layout_root;
 
-	TAILQ_FOREACH(wp1, &w->panes, entry) {
-		wp1->layout_cell = wp1->saved_layout_cell;
-		wp1->saved_layout_cell = NULL;
+	TAILQ_FOREACH(wp, &w->panes, entry) {
+		wp->layout_cell = wp->saved_layout_cell;
+		wp->saved_layout_cell = NULL;
 	}
 	layout_fix_panes(w, w->sx, w->sy);