mirror of
https://github.com/tmux/tmux.git
synced 2026-10-14 15:04:50 +00:00
Merge branch 'obsd-master'
This commit is contained in:
7
window.c
7
window.c
@@ -357,8 +357,8 @@ window_destroy(struct window *w)
|
||||
window_unzoom(w, 0);
|
||||
RB_REMOVE(windows, &windows, w);
|
||||
|
||||
layout_free_cell(w->layout_root);
|
||||
layout_free_cell(w->saved_layout_root);
|
||||
layout_free_cell(w->layout_root, 0);
|
||||
layout_free_cell(w->saved_layout_root, 0);
|
||||
free(w->old_layout);
|
||||
|
||||
window_destroy_panes(w);
|
||||
@@ -785,7 +785,7 @@ window_unzoom(struct window *w, int notify)
|
||||
return (-1);
|
||||
|
||||
w->flags &= ~WINDOW_ZOOMED;
|
||||
layout_free(w);
|
||||
layout_free(w, 0);
|
||||
w->layout_root = w->saved_layout_root;
|
||||
w->saved_layout_root = NULL;
|
||||
|
||||
@@ -1210,6 +1210,7 @@ window_pane_destroy(struct window_pane *wp)
|
||||
window_pane_clear_prompt(wp);
|
||||
|
||||
window_pane_free_modes(wp);
|
||||
screen_write_clear_dirty(wp);
|
||||
free(wp->searchstr);
|
||||
|
||||
if (wp->fd != -1) {
|
||||
|
||||
Reference in New Issue
Block a user