diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-04-27 21:21:55 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-04-27 21:21:55 +0100 |
| commit | 94a8ef1caef855d1a43b6373dd08ce0bbf4aadd5 (patch) | |
| tree | 052d89cf9193a324fb646fe25152df6aa4070534 /cmd-split-window.c | |
| parent | 72e9ebf2ece28c986050162bf4f401a6a7679f53 (diff) | |
| parent | 95195f52584565483bf9850840f6d81cd88bf9b2 (diff) | |
| download | rtmux-94a8ef1caef855d1a43b6373dd08ce0bbf4aadd5.tar.gz rtmux-94a8ef1caef855d1a43b6373dd08ce0bbf4aadd5.tar.bz2 rtmux-94a8ef1caef855d1a43b6373dd08ce0bbf4aadd5.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
tmux.1
Diffstat (limited to 'cmd-split-window.c')
| -rw-r--r-- | cmd-split-window.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cmd-split-window.c b/cmd-split-window.c index 1e7bc16a..50799cff 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -146,6 +146,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq) goto error; } new_wp = window_add_pane(w, hlimit); + layout_assign_pane(lc, new_wp); path = NULL; if (cmdq->client != NULL && cmdq->client->session == NULL) @@ -158,7 +159,6 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq) if (window_pane_spawn(new_wp, argc, argv, path, shell, cwd, &env, s->tio, &cause) != 0) goto error; - layout_assign_pane(lc, new_wp); server_redraw_window(w); @@ -193,8 +193,10 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq) error: environ_free(&env); - if (new_wp != NULL) + if (new_wp != NULL) { + layout_close_pane(new_wp); window_remove_pane(w, new_wp); + } cmdq_error(cmdq, "create pane failed: %s", cause); free(cause); if (fd != -1) |