diff options
| author | Thomas Adam <thomas@xteddy.org> | 2013-04-13 17:05:49 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2013-04-13 17:05:49 +0100 |
| commit | b58bca9a72009101da373a3b7463fd866ecac58c (patch) | |
| tree | e8f9b4b720b4c05f67fd47505b5170c4fd33dcb0 /cmd-swap-pane.c | |
| parent | e312db140868754358d40ec17595327a8fbbf180 (diff) | |
| parent | 27dcf470dc4aa5901ac7f01b3a9f971e02f2229e (diff) | |
| download | rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.tar.gz rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.tar.bz2 rtmux-b58bca9a72009101da373a3b7463fd866ecac58c.zip | |
Merge branch 'obsd-master'
Conflicts:
tmux.c
Diffstat (limited to 'cmd-swap-pane.c')
| -rw-r--r-- | cmd-swap-pane.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cmd-swap-pane.c b/cmd-swap-pane.c index d484f4e2..05317260 100644 --- a/cmd-swap-pane.c +++ b/cmd-swap-pane.c @@ -75,8 +75,12 @@ cmd_swap_pane_exec(struct cmd *self, struct cmd_q *cmdq) src_wp = TAILQ_PREV(dst_wp, window_panes, entry); if (src_wp == NULL) src_wp = TAILQ_LAST(&dst_w->panes, window_panes); - } else - return (CMD_RETURN_NORMAL); + } else { + src_wl = cmd_find_pane(cmdq, NULL, NULL, &src_wp); + if (src_wl == NULL) + return (CMD_RETURN_ERROR); + src_w = src_wl->window; + } } else { src_wl = cmd_find_pane(cmdq, args_get(args, 's'), NULL, &src_wp); if (src_wl == NULL) |