===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -c -r1.44 -r1.45
*** src/usr.bin/tmux/cmd-find.c	2017/04/05 11:04:48	1.44
--- src/usr.bin/tmux/cmd-find.c	2017/04/21 14:01:19	1.45
***************
*** 1,4 ****
! /* $OpenBSD: cmd-find.c,v 1.44 2017/04/05 11:04:48 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-find.c,v 1.45 2017/04/21 14:01:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 998,1005 ****
  	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->current)) {
! 		fs->current = &item->current;
  		log_debug("%s: current is from queue", __func__);
  	} else {
  		fs->current = current;
--- 998,1005 ----
  	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 {
  		fs->current = current;
***************
*** 1015,1021 ****
  
  	/* Mouse target is a plain = or {mouse}. */
  	if (strcmp(target, "=") == 0 || strcmp(target, "{mouse}") == 0) {
! 		m = &item->mouse;
  		switch (type) {
  		case CMD_FIND_PANE:
  			fs->wp = cmd_mouse_pane(m, &fs->s, &fs->wl);
--- 1015,1021 ----
  
  	/* 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);