===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-switch-client.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- src/usr.bin/tmux/cmd-switch-client.c	2020/04/13 14:04:25	1.63
+++ src/usr.bin/tmux/cmd-switch-client.c	2020/04/13 14:46:04	1.64
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-switch-client.c,v 1.63 2020/04/13 14:04:25 nicm Exp $ */
+/* $OpenBSD: cmd-switch-client.c,v 1.64 2020/04/13 14:46:04 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -48,8 +48,7 @@
 cmd_switch_client_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;
 	const char		*tflag = args_get(args, 't');
 	enum cmd_find_type	 type;
@@ -137,7 +136,7 @@
 	if (c->session != NULL && c->session != s)
 		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);