===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-tree.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/tmux/window-tree.c	2017/08/30 10:33:57	1.17
--- src/usr.bin/tmux/window-tree.c	2017/10/11 08:08:16	1.18
***************
*** 1,4 ****
! /* $OpenBSD: window-tree.c,v 1.17 2017/08/30 10:33:57 nicm Exp $ */
  
  /*
   * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: window-tree.c,v 1.18 2017/10/11 08:08:16 nicm Exp $ */
  
  /*
   * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 434,440 ****
  		*tag = (uint64_t)data->fs.wl;
  		break;
  	case WINDOW_TREE_PANE:
! 		*tag = (uint64_t)data->fs.wp;
  		break;
  	}
  }
--- 434,443 ----
  		*tag = (uint64_t)data->fs.wl;
  		break;
  	case WINDOW_TREE_PANE:
! 		if (window_count_panes(data->fs.wl->window) == 1)
! 			*tag = (uint64_t)data->fs.wl;
! 		else
! 			*tag = (uint64_t)data->fs.wp;
  		break;
  	}
  }