===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/mode-tree.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -c -r1.31 -r1.32
*** src/usr.bin/tmux/mode-tree.c	2019/05/26 17:34:45	1.31
--- src/usr.bin/tmux/mode-tree.c	2019/05/27 06:50:04	1.32
***************
*** 1,4 ****
! /* $OpenBSD: mode-tree.c,v 1.31 2019/05/26 17:34:45 nicm Exp $ */
  
  /*
   * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: mode-tree.c,v 1.32 2019/05/27 06:50:04 nicm Exp $ */
  
  /*
   * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 384,390 ****
  	if (mtd->line_list != NULL)
  		tag = mtd->line_list[mtd->current].item->tag;
  	else
! 		tag = 0;
  
  	TAILQ_CONCAT(&mtd->saved, &mtd->children, entry);
  	TAILQ_INIT(&mtd->children);
--- 384,390 ----
  	if (mtd->line_list != NULL)
  		tag = mtd->line_list[mtd->current].item->tag;
  	else
! 		tag = UINT64_MAX;
  
  	TAILQ_CONCAT(&mtd->saved, &mtd->children, entry);
  	TAILQ_INIT(&mtd->children);
***************
*** 400,405 ****
--- 400,407 ----
  	mode_tree_clear_lines(mtd);
  	mode_tree_build_lines(mtd, &mtd->children, 0);
  
+ 	if (tag == UINT64_MAX)
+ 		tag = mtd->line_list[mtd->current].item->tag;
  	mode_tree_set_current(mtd, tag);
  
  	mtd->width = screen_size_x(s);