Merge branch 'obsd-master'

1 files changed, 2 insertions, 2 deletions

diff --git a/window.c b/window.c
index 3c4a8c29..795bc26c 100644
--- a/window.c
+++ b/window.c
@@ -342,6 +342,8 @@ window_destroy(struct window *w)
 		layout_free_cell(w->saved_layout_root);
 	free(w->old_layout);
 
+	window_destroy_panes(w);
+
 	if (event_initialized(&w->name_event))
 		evtimer_del(&w->name_event);
 
@@ -352,8 +354,6 @@ window_destroy(struct window *w)
 
 	options_free(w->options);
 
-	window_destroy_panes(w);
-
 	free(w->name);
 	free(w);
 }