===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/names.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- src/usr.bin/tmux/names.c	2012/04/08 06:47:26	1.14
+++ src/usr.bin/tmux/names.c	2012/04/11 07:45:30	1.15
@@ -1,4 +1,4 @@
-/* $OpenBSD: names.c,v 1.14 2012/04/08 06:47:26 nicm Exp $ */
+/* $OpenBSD: names.c,v 1.15 2012/04/11 07:45:30 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -49,7 +49,12 @@
 	struct window	*w = data;
 	char		*name, *wname;
 
-	queue_window_name(w); /* stopped when option turned off */
+	if (!options_get_number(&w->options, "automatic-rename")) {
+		if (event_initialized(&w->name_timer))
+			event_del(&w->name_timer);
+		return;
+	}
+	queue_window_name(w);
 
 	if (w->active->screen != &w->active->base)
 		name = NULL;