diff options
| author | Thomas Adam <thomas@xteddy.org> | 2018-04-10 13:02:28 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2018-04-10 13:02:28 +0100 |
| commit | 1bd66b65a330ffdf46eac668de92bf632ab5ad82 (patch) | |
| tree | 6fab4904461f291c7f873353523259aded2c57e7 /cmd-kill-pane.c | |
| parent | 68bf7c532b83efdb1b29f1ee9a3e06f31f55dcd8 (diff) | |
| parent | 051a29ca03718c8fedd5918ba86556f29672348e (diff) | |
| download | rtmux-1bd66b65a330ffdf46eac668de92bf632ab5ad82.tar.gz rtmux-1bd66b65a330ffdf46eac668de92bf632ab5ad82.tar.bz2 rtmux-1bd66b65a330ffdf46eac668de92bf632ab5ad82.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-kill-pane.c')
| -rw-r--r-- | cmd-kill-pane.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/cmd-kill-pane.c b/cmd-kill-pane.c index a8a423d0..01b1f518 100644 --- a/cmd-kill-pane.c +++ b/cmd-kill-pane.c @@ -47,9 +47,8 @@ cmd_kill_pane_exec(struct cmd *self, struct cmdq_item *item) struct winlink *wl = item->target.wl; struct window_pane *loopwp, *tmpwp, *wp = item->target.wp; - server_unzoom_window(wl->window); - if (args_has(self->args, 'a')) { + server_unzoom_window(wl->window); TAILQ_FOREACH_SAFE(loopwp, &wl->window->panes, entry, tmpwp) { if (loopwp == wp) continue; @@ -60,13 +59,6 @@ cmd_kill_pane_exec(struct cmd *self, struct cmdq_item *item) return (CMD_RETURN_NORMAL); } - if (window_count_panes(wl->window) == 1) { - server_kill_window(wl->window); - recalculate_sizes(); - } else { - layout_close_pane(wp); - window_remove_pane(wl->window, wp); - server_redraw_window(wl->window); - } + server_kill_pane(wp); return (CMD_RETURN_NORMAL); } |