summaryrefslogtreecommitdiffstats
path: root/cmd-join-pane.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-06-04 12:59:41 +0100
committerThomas Adam <thomas@xteddy.org>2015-06-04 12:59:41 +0100
commit02e348c069b9f49b44344281276b81fe537b3c8b (patch)
tree889ef55ab3da4ba5e3a8fe6aa7c3cb5708cdd724 /cmd-join-pane.c
parent1de74e27e535b3e294c265974973a7743c8374a0 (diff)
parenta863834574ec02b87ff0e7245ef31f0d4543ab34 (diff)
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-join-pane.c')
-rw-r--r--cmd-join-pane.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd-join-pane.c b/cmd-join-pane.c
index 5603541a..3d2a04b2 100644
--- a/cmd-join-pane.c
+++ b/cmd-join-pane.c
@@ -74,7 +74,7 @@ join_pane(struct cmd *self, struct cmd_q *cmdq, int not_same_window)
dst_idx = dst_wl->idx;
server_unzoom_window(dst_w);
- src_wl = cmd_find_pane(cmdq, args_get(args, 's'), NULL, &src_wp);
+ src_wl = cmd_find_pane_marked(cmdq, args_get(args, 's'), NULL, &src_wp);
if (src_wl == NULL)
return (CMD_RETURN_ERROR);
src_w = src_wl->window;