===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -c -r1.119 -r1.120
*** src/usr.bin/tmux/window.c	2015/04/20 07:50:49	1.119
--- src/usr.bin/tmux/window.c	2015/04/21 22:38:50	1.120
***************
*** 1,4 ****
! /* $OpenBSD: window.c,v 1.119 2015/04/20 07:50:49 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window.c,v 1.120 2015/04/21 22:38:50 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 519,524 ****
--- 519,525 ----
  	w->flags &= ~WINDOW_ZOOMED;
  	layout_free(w);
  	w->layout_root = w->saved_layout_root;
+ 	w->saved_layout_root = NULL;
  
  	TAILQ_FOREACH(wp, &w->panes, entry) {
  		wp->layout_cell = wp->saved_layout_cell;