1 files changed, 6 insertions, 5 deletions

diff --git a/cmd-find.c b/cmd-find.c
index aa36bc35..bbf8c3d9 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -960,10 +960,11 @@ cmd_find_target(struct cmd_find_state *fs, struct cmdq_item *item,
 	if (server_check_marked() && (flags & CMD_FIND_DEFAULT_MARKED)) {
 		fs->current = &marked_pane;
 		log_debug("%s: current is marked pane", __func__);
-	} else if (cmd_find_valid_state(&item->shared->current)) {
-		fs->current = &item->shared->current;
+	} else if (cmd_find_valid_state(&cmdq_get_shared(item)->current)) {
+		fs->current = &cmdq_get_shared(item)->current;
 		log_debug("%s: current is from queue", __func__);
-	} else if (cmd_find_from_client(&current, item->client, flags) == 0) {
+	} else if (cmd_find_from_client(&current, cmdq_get_client(item),
+	    flags) == 0) {
 		fs->current = &current;
 		log_debug("%s: current is from client", __func__);
 	} else {
@@ -980,7 +981,7 @@ cmd_find_target(struct cmd_find_state *fs, struct cmdq_item *item,
 
 	/* Mouse target is a plain = or {mouse}. */
 	if (strcmp(target, "=") == 0 || strcmp(target, "{mouse}") == 0) {
-		m = &item->shared->mouse;
+		m = &cmdq_get_shared(item)->mouse;
 		switch (type) {
 		case CMD_FIND_PANE:
 			fs->wp = cmd_mouse_pane(m, &fs->s, &fs->wl);
@@ -1236,7 +1237,7 @@ cmd_find_current_client(struct cmdq_item *item, int quiet)
 	struct cmd_find_state	 fs;
 
 	if (item != NULL)
-		c = item->client;
+		c = cmdq_get_client(item);
 	if (c != NULL && c->session != NULL)
 		return (c);