===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/names.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/tmux/names.c	2009/07/08 05:26:45	1.4
--- src/usr.bin/tmux/names.c	2009/08/18 21:18:20	1.5
***************
*** 1,4 ****
! /* $OpenBSD: names.c,v 1.4 2009/07/08 05:26:45 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: names.c,v 1.5 2009/08/18 21:18:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 42,49 ****
  		w = ARRAY_ITEM(&windows, i);
  		if (w == NULL || w->active == NULL)
  			continue;
- 		if (!options_get_number(&w->options, "automatic-rename"))
- 			continue;
  
  		if (timercmp(&tv, &w->name_timer, <))
  			continue;
--- 42,47 ----
***************
*** 51,56 ****
--- 49,57 ----
  		tv2.tv_sec = 0;
  		tv2.tv_usec = NAME_INTERVAL * 1000L;
  		timeradd(&w->name_timer, &tv2, &w->name_timer);
+ 
+ 		if (!options_get_number(&w->options, "automatic-rename"))
+ 			continue;
  
  		if (w->active->screen != &w->active->base)
  			name = NULL;