diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-07-19 08:10:07 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2015-07-19 08:10:07 +0100 |
| commit | e6facdcb0c5869d88f4a471b4ac8cd4399bcfc0f (patch) | |
| tree | c6c3064326ae46d668196f2ac9f7d1422e2147a3 | |
| parent | 96dcbe217bda0b065df8079e33d14a7192e14c46 (diff) | |
| parent | e45f42db29b70addec8d1dd9b63dddd31160968c (diff) | |
| download | rtmux-e6facdcb0c5869d88f4a471b4ac8cd4399bcfc0f.tar.gz rtmux-e6facdcb0c5869d88f4a471b4ac8cd4399bcfc0f.tar.bz2 rtmux-e6facdcb0c5869d88f4a471b4ac8cd4399bcfc0f.zip | |
Merge branch 'master' of github.com:tmux/tmux
| -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)) |