===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- src/usr.bin/tmux/window.c	2015/08/28 15:51:48	1.138
+++ src/usr.bin/tmux/window.c	2015/08/28 16:10:46	1.139
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.138 2015/08/28 15:51:48 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.139 2015/08/28 16:10:46 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -299,6 +299,8 @@
 		fatal("gettimeofday failed");
 
 	options_init(&w->options, &global_w_options);
+	if (options_get_number(&w->options, "automatic-rename"))
+		queue_window_name(w);
 
 	w->references = 0;
 
@@ -346,6 +348,9 @@
 	if (w->saved_layout_root != NULL)
 		layout_free_cell(w->saved_layout_root);
 	free(w->old_layout);
+
+	if (event_initialized(&w->name_timer))
+		evtimer_del(&w->name_timer);
 
 	options_free(&w->options);