Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2015-07-17 16:01:07 +01:00
commit e45f42db29

View File

@ -340,12 +340,12 @@ window_create(const char *name, int argc, char **argv, const char *path,
void void
window_destroy(struct window *w) window_destroy(struct window *w)
{ {
window_unzoom(w);
RB_REMOVE(windows, &windows, w); RB_REMOVE(windows, &windows, w);
if (w->layout_root != NULL) 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); free(w->old_layout);
if (event_initialized(&w->name_timer)) if (event_initialized(&w->name_timer))