===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-option.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -c -r1.71 -r1.72
*** src/usr.bin/tmux/cmd-set-option.c	2014/10/20 22:29:25	1.71
--- src/usr.bin/tmux/cmd-set-option.c	2015/04/22 15:30:11	1.72
***************
*** 1,4 ****
! /* $OpenBSD: cmd-set-option.c,v 1.71 2014/10/20 22:29:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-set-option.c,v 1.72 2015/04/22 15:30:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 176,184 ****
  
  	/* Start or stop timers when automatic-rename changed. */
  	if (strcmp(oe->name, "automatic-rename") == 0) {
! 		for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
! 			if ((w = ARRAY_ITEM(&windows, i)) == NULL)
! 				continue;
  			if (options_get_number(&w->options, "automatic-rename"))
  				queue_window_name(w);
  			else if (event_initialized(&w->name_timer))
--- 176,182 ----
  
  	/* Start or stop timers when automatic-rename changed. */
  	if (strcmp(oe->name, "automatic-rename") == 0) {
! 		RB_FOREACH(w, windows, &windows) {
  			if (options_get_number(&w->options, "automatic-rename"))
  				queue_window_name(w);
  			else if (event_initialized(&w->name_timer))