aboutsummaryrefslogtreecommitdiff
path: root/window.c
diff options
context:
space:
mode:
authorThomas <thomas@xteddy.org>2013-03-26 16:59:37 +0000
committerThomas <thomas@xteddy.org>2013-03-26 16:59:37 +0000
commit399a15b9fc06bee7860d7e29c8315776ed87beea (patch)
tree253e0b4ede9c368f25b330b939dfe8640412b78e /window.c
parent00af2df1027301a31531321c12eae6ff32989a3a (diff)
parentdfac36b6c3d72ac3732ec2c638b8bae16d1a01ae (diff)
downloadrtmux-399a15b9fc06bee7860d7e29c8315776ed87beea.tar.gz
rtmux-399a15b9fc06bee7860d7e29c8315776ed87beea.tar.bz2
rtmux-399a15b9fc06bee7860d7e29c8315776ed87beea.zip
Merge branch 'obsd-master'
Diffstat (limited to 'window.c')
-rw-r--r--window.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/window.c b/window.c
index e30fb7e4..7678adc6 100644
--- a/window.c
+++ b/window.c
@@ -493,19 +493,18 @@ window_zoom(struct window_pane *wp)
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);