===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window-tree.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/tmux/window-tree.c	2017/08/09 11:43:45	1.15
--- src/usr.bin/tmux/window-tree.c	2017/08/09 13:44:36	1.16
***************
*** 1,4 ****
! /* $OpenBSD: window-tree.c,v 1.15 2017/08/09 11:43:45 nicm Exp $ */
  
  /*
   * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: window-tree.c,v 1.16 2017/08/09 13:44:36 nicm Exp $ */
  
  /*
   * Copyright (c) 2017 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 241,253 ****
  }
  
  static int
  window_tree_build_window(struct session *s, struct winlink *wl, void* modedata,
      u_int sort_type, struct mode_tree_item *parent, const char *filter)
  {
  	struct window_tree_modedata	*data = modedata;
  	struct window_tree_itemdata	*item;
  	struct mode_tree_item		*mti;
! 	char				*name, *text, *cp;
  	struct window_pane		*wp, **l;
  	u_int				 n, i;
  	int				 expanded;
--- 241,270 ----
  }
  
  static int
+ window_tree_filter_pane(struct session *s, struct winlink *wl,
+     struct window_pane *wp, const char *filter)
+ {
+ 	char	*cp;
+ 	int	 result;
+ 
+ 	if (filter == NULL)
+ 		return (1);
+ 
+ 	cp = format_single(NULL, filter, NULL, s, wl, wp);
+ 	result = format_true(cp);
+ 	free(cp);
+ 
+ 	return (result);
+ }
+ 
+ static int
  window_tree_build_window(struct session *s, struct winlink *wl, void* modedata,
      u_int sort_type, struct mode_tree_item *parent, const char *filter)
  {
  	struct window_tree_modedata	*data = modedata;
  	struct window_tree_itemdata	*item;
  	struct mode_tree_item		*mti;
! 	char				*name, *text;
  	struct window_pane		*wp, **l;
  	u_int				 n, i;
  	int				 expanded;
***************
*** 271,300 ****
  	free(text);
  	free(name);
  
! 	if (window_count_panes(wl->window) == 1)
  		return (1);
  
  	l = NULL;
  	n = 0;
  
  	TAILQ_FOREACH(wp, &wl->window->panes, entry) {
! 		if (filter != NULL) {
! 			cp = format_single(NULL, filter, NULL, s, wl, wp);
! 			if (!format_true(cp)) {
! 				free(cp);
! 				continue;
! 			}
! 			free(cp);
! 		}
  		l = xreallocarray(l, n + 1, sizeof *l);
  		l[n++] = wp;
  	}
! 	if (n == 0) {
! 		window_tree_free_item(item);
! 		data->item_size--;
! 		mode_tree_remove(data->data, mti);
! 		return (0);
! 	}
  
  	switch (sort_type) {
  	case WINDOW_TREE_BY_INDEX:
--- 288,311 ----
  	free(text);
  	free(name);
  
! 	wp = TAILQ_FIRST(&wl->window->panes);
! 	if (TAILQ_NEXT(wp, entry) == NULL) {
! 		if (!window_tree_filter_pane(s, wl, wp, filter))
! 			goto empty;
  		return (1);
+ 	}
  
  	l = NULL;
  	n = 0;
  
  	TAILQ_FOREACH(wp, &wl->window->panes, entry) {
! 		if (!window_tree_filter_pane(s, wl, wp, filter))
! 			continue;
  		l = xreallocarray(l, n + 1, sizeof *l);
  		l[n++] = wp;
  	}
! 	if (n == 0)
! 		goto empty;
  
  	switch (sort_type) {
  	case WINDOW_TREE_BY_INDEX:
***************
*** 311,316 ****
--- 322,333 ----
  		window_tree_build_pane(s, wl, l[i], modedata, mti);
  	free(l);
  	return (1);
+ 
+ empty:
+ 	window_tree_free_item(item);
+ 	data->item_size--;
+ 	mode_tree_remove(data->data, mti);
+ 	return (0);
  }
  
  static void