aboutsummaryrefslogtreecommitdiff
path: root/cmd-choose-tree.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-choose-tree.c
parent52e3d960e7ebe2006509d48c427ffd8f25a0cf52 (diff)
parentc20eb0c0ae3347c768894a6355adfd7ebae6f2f3 (diff)
downloadrtmux-b117c3b81217a11946ac784cfbe2ef1f3725b207.tar.gz
rtmux-b117c3b81217a11946ac784cfbe2ef1f3725b207.tar.bz2
rtmux-b117c3b81217a11946ac784cfbe2ef1f3725b207.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-choose-tree.c')
-rw-r--r--cmd-choose-tree.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-choose-tree.c b/cmd-choose-tree.c
index 8178ec9f..8b667ec5 100644
--- a/cmd-choose-tree.c
+++ b/cmd-choose-tree.c
@@ -71,21 +71,21 @@ const struct cmd_entry cmd_choose_buffer_entry = {
static enum cmd_retval
cmd_choose_tree_exec(struct cmd *self, struct cmdq_item *item)
{
- struct args *args = self->args;
+ struct args *args = cmd_get_args(self);
struct window_pane *wp = item->target.wp;
const struct window_mode *mode;
- if (self->entry == &cmd_choose_buffer_entry) {
+ if (cmd_get_entry(self) == &cmd_choose_buffer_entry) {
if (paste_get_top(NULL) == NULL)
return (CMD_RETURN_NORMAL);
mode = &window_buffer_mode;
- } else if (self->entry == &cmd_choose_client_entry) {
+ } else if (cmd_get_entry(self) == &cmd_choose_client_entry) {
if (server_client_how_many() == 0)
return (CMD_RETURN_NORMAL);
mode = &window_client_mode;
} else
mode = &window_tree_mode;
- window_pane_set_mode(wp, mode, &item->target, args);
+ window_pane_set_mode(wp, NULL, mode, &item->target, args);
return (CMD_RETURN_NORMAL);
}