circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-05 10:28:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:tmux/tmux

Browse Source
This commit is contained in:
Nicholas Marriott 2015-07-19 08:10:07 +01:00
commit e6facdcb0c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server-client.c
View File

@ -95,6 +95,7 @@ server_client_create(int fd)
environ_init(&c->environ);
c->fd = -1;
c->cwd = -1;
c->cmdq = cmdq_new(c);

6
window.c
View File

@ -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))