diff options
-rw-r--r-- | server-client.c | 1 | ||||
-rw-r--r-- | window.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/server-client.c b/server-client.c index 59969618..91dd9daf 100644 --- a/server-client.c +++ b/server-client.c @@ -95,6 +95,7 @@ server_client_create(int fd) environ_init(&c->environ); + c->fd = -1; c->cwd = -1; c->cmdq = cmdq_new(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)) |