===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -c -r1.134 -r1.135
*** src/usr.bin/tmux/window.c	2015/06/17 16:50:28	1.134
--- src/usr.bin/tmux/window.c	2015/07/17 13:09:07	1.135
***************
*** 1,4 ****
! /* $OpenBSD: window.c,v 1.134 2015/06/17 16:50:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window.c,v 1.135 2015/07/17 13:09:07 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 341,352 ****
  void
  window_destroy(struct window *w)
  {
- 	window_unzoom(w);
- 
  	RB_REMOVE(windows, &windows, w);
  
  	if (w->layout_root != NULL)
! 		layout_free(w);
  	free(w->old_layout);
  
  	if (event_initialized(&w->name_timer))
--- 341,352 ----
  void
  window_destroy(struct window *w)
  {
  	RB_REMOVE(windows, &windows, w);
  
  	if (w->layout_root != NULL)
! 		layout_free_cell(w->layout_root);
! 	if (w->saved_layout_root != NULL)
! 		layout_free_cell(w->saved_layout_root);
  	free(w->old_layout);
  
  	if (event_initialized(&w->name_timer))