===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -c -r1.74 -r1.75
*** src/usr.bin/tmux/cmd-find.c	2020/04/09 13:54:38	1.74
--- src/usr.bin/tmux/cmd-find.c	2020/04/13 10:59:58	1.75
***************
*** 1,4 ****
! /* $OpenBSD: cmd-find.c,v 1.74 2020/04/09 13:54:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-find.c,v 1.75 2020/04/13 10:59:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 961,970 ****
  	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;
  		log_debug("%s: current is from queue", __func__);
! 	} else if (cmd_find_from_client(&current, item->client, flags) == 0) {
  		fs->current = &current;
  		log_debug("%s: current is from client", __func__);
  	} else {
--- 961,971 ----
  	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(&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, cmdq_get_client(item),
! 	    flags) == 0) {
  		fs->current = &current;
  		log_debug("%s: current is from client", __func__);
  	} else {
***************
*** 981,987 ****
  
  	/* Mouse target is a plain = or {mouse}. */
  	if (strcmp(target, "=") == 0 || strcmp(target, "{mouse}") == 0) {
! 		m = &item->shared->mouse;
  		switch (type) {
  		case CMD_FIND_PANE:
  			fs->wp = cmd_mouse_pane(m, &fs->s, &fs->wl);
--- 982,988 ----
  
  	/* Mouse target is a plain = or {mouse}. */
  	if (strcmp(target, "=") == 0 || strcmp(target, "{mouse}") == 0) {
! 		m = &cmdq_get_shared(item)->mouse;
  		switch (type) {
  		case CMD_FIND_PANE:
  			fs->wp = cmd_mouse_pane(m, &fs->s, &fs->wl);
***************
*** 1237,1243 ****
  	struct cmd_find_state	 fs;
  
  	if (item != NULL)
! 		c = item->client;
  	if (c != NULL && c->session != NULL)
  		return (c);
  
--- 1238,1244 ----
  	struct cmd_find_state	 fs;
  
  	if (item != NULL)
! 		c = cmdq_get_client(item);
  	if (c != NULL && c->session != NULL)
  		return (c);