===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-new-session.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- src/usr.bin/tmux/cmd-new-session.c	2020/04/13 14:04:25	1.127
+++ src/usr.bin/tmux/cmd-new-session.c	2020/04/13 14:46:04	1.128
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-new-session.c,v 1.127 2020/04/13 14:04:25 nicm Exp $ */
+/* $OpenBSD: cmd-new-session.c,v 1.128 2020/04/13 14:46:04 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -67,8 +67,7 @@
 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 @@
 		} 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);