aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-07-17 16:01:07 +0100
committerThomas Adam <thomas@xteddy.org>2015-07-17 16:01:07 +0100
commite45f42db29b70addec8d1dd9b63dddd31160968c (patch)
treea6e4b9bd23d5b84094f375d256190744c67aaeeb
parentb88639304239f8f46f72fd7fbf10abb45d942f1f (diff)
parentbad8d0fd200c7718a8f51f52b9dd2f23c74d996f (diff)
downloadrtmux-e45f42db29b70addec8d1dd9b63dddd31160968c.tar.gz
rtmux-e45f42db29b70addec8d1dd9b63dddd31160968c.tar.bz2
rtmux-e45f42db29b70addec8d1dd9b63dddd31160968c.zip
Merge branch 'obsd-master'
-rw-r--r--window.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/window.c b/window.c
index fab9949e..1a6d74e6 100644
--- a/window.c
+++ b/window.c
@@ -340,12 +340,12 @@ window_create(const char *name, int argc, char **argv, const char *path,
void
window_destroy(struct window *w)
{
- window_unzoom(w);
-
RB_REMOVE(windows, &windows, w);
if (w->layout_root != NULL)
- layout_free(w);
+ 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))