===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/names.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- src/usr.bin/tmux/names.c	2009/12/03 22:50:10	1.11
+++ src/usr.bin/tmux/names.c	2012/03/09 21:11:28	1.12
@@ -1,4 +1,4 @@
-/* $OpenBSD: names.c,v 1.11 2009/12/03 22:50:10 nicm Exp $ */
+/* $OpenBSD: names.c,v 1.12 2012/03/09 21:11:28 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -78,13 +78,11 @@
 		wname = name;
 	}
 
-	if (strcmp(wname, w->name) == 0)
-		xfree(wname);
-	else {
-		xfree(w->name);
-		w->name = wname;
+	if (strcmp(wname, w->name)) {
+		window_set_name(w, wname);
 		server_status_window(w);
 	}
+	xfree(wname);
 }
 
 char *