From 620402a833a4e42590a26390d2b7a39fd39e3ea9 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 19 Aug 2009 09:00:06 +0000
Subject: This is a better fix for OS X stupidity.

---
 names.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'names.c')

diff --git a/names.c b/names.c
index 744013a9..e7c95f14 100644
--- a/names.c
+++ b/names.c
@@ -1,4 +1,4 @@
-/* $Id: names.c,v 1.11 2009-07-02 18:26:55 nicm Exp $ */
+/* $OpenBSD: names.c,v 1.5 2009/08/18 21:18:20 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -42,8 +42,6 @@ set_window_names(void)
 		w = ARRAY_ITEM(&windows, i);
 		if (w == NULL || w->active == NULL)
 			continue;
-		if (!options_get_number(&w->options, "automatic-rename"))
-			continue;
 
 		if (timercmp(&tv, &w->name_timer, <))
 			continue;
@@ -52,6 +50,9 @@ set_window_names(void)
 		tv2.tv_usec = NAME_INTERVAL * 1000L;
 		timeradd(&w->name_timer, &tv2, &w->name_timer);
 
+		if (!options_get_number(&w->options, "automatic-rename"))
+			continue;
+
 		if (w->active->screen != &w->active->base)
 			name = NULL;
 		else
-- 
cgit