===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-set-option.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- src/usr.bin/tmux/cmd-set-option.c	2015/08/28 16:10:46	1.80
+++ src/usr.bin/tmux/cmd-set-option.c	2015/08/29 00:29:15	1.81
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-set-option.c,v 1.80 2015/08/28 16:10:46 nicm Exp $ */
+/* $OpenBSD: cmd-set-option.c,v 1.81 2015/08/29 00:29:15 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -180,9 +180,7 @@
 	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))
-				evtimer_del(&w->name_timer);
+				w->active->flags |= PANE_CHANGED;
 		}
 	}
 	if (strcmp(oe->name, "status") == 0 ||