diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-04-23 11:26:11 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-04-23 11:26:11 +0100 |
| commit | 953c3ef47a1933d38308075c1bacc7ea8d38301b (patch) | |
| tree | 6484bdd51ecedbb5888717db271c151257ec87f5 /cmd-join-pane.c | |
| parent | 12e9c974fadc5ed6f0e7db10c40d5a0d55e0da8a (diff) | |
| parent | 64613b9d411a7c76a50a2f9c66df345f082fce25 (diff) | |
| download | rtmux-953c3ef47a1933d38308075c1bacc7ea8d38301b.tar.gz rtmux-953c3ef47a1933d38308075c1bacc7ea8d38301b.tar.bz2 rtmux-953c3ef47a1933d38308075c1bacc7ea8d38301b.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
tmux.1
window.c
Diffstat (limited to 'cmd-join-pane.c')
| -rw-r--r-- | cmd-join-pane.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cmd-join-pane.c b/cmd-join-pane.c index 1a710cec..000fdba9 100644 --- a/cmd-join-pane.c +++ b/cmd-join-pane.c @@ -138,11 +138,7 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window) layout_close_pane(src_wp); - if (src_w->active == src_wp) { - src_w->active = TAILQ_PREV(src_wp, window_panes, entry); - if (src_w->active == NULL) - src_w->active = TAILQ_NEXT(src_wp, entry); - } + window_lost_pane(src_w, src_wp); TAILQ_REMOVE(&src_w->panes, src_wp, entry); if (window_count_panes(src_w) == 0) |