diff options
| author | Thomas Adam <thomas@xteddy.org> | 2020-04-13 10:30:00 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2020-04-13 10:30:00 +0100 |
| commit | b117c3b81217a11946ac784cfbe2ef1f3725b207 (patch) | |
| tree | 196cc4a27cb75def4466d418cb91dd3fcfdfbf5b /cmd-move-window.c | |
| parent | 52e3d960e7ebe2006509d48c427ffd8f25a0cf52 (diff) | |
| parent | c20eb0c0ae3347c768894a6355adfd7ebae6f2f3 (diff) | |
| download | rtmux-b117c3b81217a11946ac784cfbe2ef1f3725b207.tar.gz rtmux-b117c3b81217a11946ac784cfbe2ef1f3725b207.tar.bz2 rtmux-b117c3b81217a11946ac784cfbe2ef1f3725b207.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-move-window.c')
| -rw-r--r-- | cmd-move-window.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmd-move-window.c b/cmd-move-window.c index cb64d1e0..aaeb12b0 100644 --- a/cmd-move-window.c +++ b/cmd-move-window.c @@ -59,7 +59,7 @@ const struct cmd_entry cmd_link_window_entry = { static enum cmd_retval cmd_move_window_exec(struct cmd *self, struct cmdq_item *item) { - struct args *args = self->args; + struct args *args = cmd_get_args(self); const char *tflag = args_get(args, 't'); struct session *src; struct session *dst; @@ -86,11 +86,11 @@ cmd_move_window_exec(struct cmd *self, struct cmdq_item *item) wl = item->source.wl; idx = item->target.idx; - kflag = args_has(self->args, 'k'); - dflag = args_has(self->args, 'd'); - sflag = args_has(self->args, 's'); + kflag = args_has(args, 'k'); + dflag = args_has(args, 'd'); + sflag = args_has(args, 's'); - if (args_has(self->args, 'a')) { + if (args_has(args, 'a')) { if ((idx = winlink_shuffle_up(dst, dst->curw)) == -1) return (CMD_RETURN_ERROR); } @@ -101,7 +101,7 @@ cmd_move_window_exec(struct cmd *self, struct cmdq_item *item) free(cause); return (CMD_RETURN_ERROR); } - if (self->entry == &cmd_move_window_entry) + if (cmd_get_entry(self) == &cmd_move_window_entry) server_unlink_window(src, wl); /* |