aboutsummaryrefslogtreecommitdiff
path: root/cmd-attach-session.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2020-04-13 18:01:43 +0100
committerThomas Adam <thomas@xteddy.org>2020-04-13 18:01:43 +0100
commitacc00cd13a767067f85ed27d52ad543c9a58869c (patch)
tree924a72d2029f32a3fb2b544bbc295b7e19bd197e /cmd-attach-session.c
parent0a11f1607b9f3623dce287d4940bb925b533a340 (diff)
parent34804f2709a16dca45dc072fb53d03f79db61e51 (diff)
downloadrtmux-acc00cd13a767067f85ed27d52ad543c9a58869c.tar.gz
rtmux-acc00cd13a767067f85ed27d52ad543c9a58869c.tar.bz2
rtmux-acc00cd13a767067f85ed27d52ad543c9a58869c.zip
Merge branch 'obsd-master'
Diffstat (limited to 'cmd-attach-session.c')
-rw-r--r--cmd-attach-session.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/cmd-attach-session.c b/cmd-attach-session.c
index 00a852fc..8c30c767 100644
--- a/cmd-attach-session.c
+++ b/cmd-attach-session.c
@@ -50,8 +50,7 @@ enum cmd_retval
cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag,
int xflag, int rflag, const char *cflag, int Eflag)
{
- struct cmdq_state *state = cmdq_get_state(item);
- struct cmd_find_state *current = &state->current;
+ struct cmd_find_state *current = cmdq_get_current(item);
struct cmd_find_state target;
enum cmd_find_type type;
int flags;
@@ -120,7 +119,7 @@ cmd_attach_session(struct cmdq_item *item, const char *tflag, int dflag,
environ_update(s->options, c->environ, s->environ);
c->session = s;
- if (~state->flags & CMDQ_STATE_REPEAT)
+ if (~cmdq_get_flags(item) & CMDQ_STATE_REPEAT)
server_client_set_key_table(c, NULL);
tty_update_client_offset(c);
status_timer_start(c);