summaryrefslogtreecommitdiffstats
path: root/cmd-join-pane.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-04-13 10:30:00 +0100
committerThomas Adam <thomas@xteddy.org>2020-04-13 10:30:00 +0100
commitb117c3b81217a11946ac784cfbe2ef1f3725b207 (patch)
tree196cc4a27cb75def4466d418cb91dd3fcfdfbf5b /cmd-join-pane.c
parent52e3d960e7ebe2006509d48c427ffd8f25a0cf52 (diff)
parentc20eb0c0ae3347c768894a6355adfd7ebae6f2f3 (diff)
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-join-pane.c')
-rw-r--r--cmd-join-pane.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-join-pane.c b/cmd-join-pane.c
index 788f003a..5c7060b0 100644
--- a/cmd-join-pane.c
+++ b/cmd-join-pane.c
@@ -62,7 +62,7 @@ const struct cmd_entry cmd_move_pane_entry = {
static enum cmd_retval
cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
{
- struct args *args = self->args;
+ struct args *args = cmd_get_args(self);
struct cmd_find_state *current = &item->shared->current;
struct session *dst_s;
struct winlink *src_wl, *dst_wl;
@@ -74,7 +74,7 @@ cmd_join_pane_exec(struct cmd *self, struct cmdq_item *item)
enum layout_type type;
struct layout_cell *lc;
- if (self->entry == &cmd_join_pane_entry)
+ if (cmd_get_entry(self) == &cmd_join_pane_entry)
not_same_window = 1;
else
not_same_window = 0;