===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-find.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -c -r1.37 -r1.38
*** src/usr.bin/tmux/cmd-find.c	2016/10/16 19:04:05	1.37
--- src/usr.bin/tmux/cmd-find.c	2016/10/16 22:06:40	1.38
***************
*** 1,4 ****
! /* $OpenBSD: cmd-find.c,v 1.37 2016/10/16 19:04:05 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-find.c,v 1.38 2016/10/16 22:06:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2015 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 228,234 ****
  	struct winlink	 *wl, *wl_loop;
  
  	wl = NULL;
! 	if (fs->s->curw->window == fs->w)
  		wl = fs->s->curw;
  	else {
  		RB_FOREACH(wl_loop, winlinks, &fs->s->windows) {
--- 228,234 ----
  	struct winlink	 *wl, *wl_loop;
  
  	wl = NULL;
! 	if (fs->s->curw != NULL && fs->s->curw->window == fs->w)
  		wl = fs->s->curw;
  	else {
  		RB_FOREACH(wl_loop, winlinks, &fs->s->windows) {