===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -c -r1.77 -r1.78
*** src/usr.bin/tmux/cmd-find.c	2020/04/13 14:04:25	1.77
--- src/usr.bin/tmux/cmd-find.c	2020/04/13 14:46:04	1.78
***************
*** 1,4 ****
! /* $OpenBSD: cmd-find.c,v 1.77 2020/04/13 14:04:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-find.c,v 1.78 2020/04/13 14:46:04 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 961,968 ****
  	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_state(item)->current)) {
! 		fs->current = &cmdq_get_state(item)->current;
  		log_debug("%s: current is from queue", __func__);
  	} else if (cmd_find_from_client(&current, cmdq_get_client(item),
  	    flags) == 0) {
--- 961,968 ----
  	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_current(item))) {
! 		fs->current = cmdq_get_current(item);
  		log_debug("%s: current is from queue", __func__);
  	} else if (cmd_find_from_client(&current, cmdq_get_client(item),
  	    flags) == 0) {
***************
*** 982,988 ****
  
  	/* Mouse target is a plain = or {mouse}. */
  	if (strcmp(target, "=") == 0 || strcmp(target, "{mouse}") == 0) {
! 		m = &cmdq_get_state(item)->event.m;
  		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_event(item)->m;
  		switch (type) {
  		case CMD_FIND_PANE:
  			fs->wp = cmd_mouse_pane(m, &fs->s, &fs->wl);