aboutsummaryrefslogtreecommitdiff
path: root/cmd-new-session.c
diff options
context:
space:
mode:
Diffstat (limited to 'cmd-new-session.c')
-rw-r--r--cmd-new-session.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/cmd-new-session.c b/cmd-new-session.c
index 551cd74c..574cd5cd 100644
--- a/cmd-new-session.c
+++ b/cmd-new-session.c
@@ -67,8 +67,7 @@ static enum cmd_retval
cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
{
struct args *args = cmd_get_args(self);
- 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 = cmdq_get_target(item);
struct client *c = cmdq_get_client(item);
struct session *s, *as, *groupwith;
@@ -317,7 +316,7 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
} else if (c->session != NULL)
c->last_session = c->session;
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);
@@ -345,10 +344,10 @@ cmd_new_session_exec(struct cmd *self, struct cmdq_item *item)
free(cp);
}
- if (!detached) {
+ if (!detached)
c->flags |= CLIENT_ATTACHED;
+ if (!args_has(args, 'd'))
cmd_find_from_session(current, s, 0);
- }
cmd_find_from_session(&fs, s, 0);
cmdq_insert_hook(s, item, &fs, "after-new-session");