mirror of
https://github.com/tmux/tmux.git
synced 2026-05-30 14:16:18 +00:00
Merge branch 'master' into floating_panes
This commit is contained in:
@@ -289,7 +289,7 @@ layout_parse(struct window *w, const char *layout, char **cause)
|
||||
if (floating_lc != NULL)
|
||||
layout_assign(&wp, floating_lc, PANE_FLOATING);
|
||||
|
||||
/* Fix pane Z indexes. */
|
||||
/* Fix pane z-indexes. */
|
||||
while (!TAILQ_EMPTY(&w->z_index)) {
|
||||
wp = TAILQ_FIRST(&w->z_index);
|
||||
TAILQ_REMOVE(&w->z_index, wp, zentry);
|
||||
@@ -305,8 +305,7 @@ layout_parse(struct window *w, const char *layout, char **cause)
|
||||
layout_print_cell(tiled_lc, __func__, 0);
|
||||
|
||||
/* Free the floating layout cell, no longer needed. */
|
||||
if (floating_lc != NULL)
|
||||
layout_free_cell(floating_lc);
|
||||
layout_free_cell(floating_lc);
|
||||
|
||||
notify_window("window-layout-changed", w);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user