From 8b7be5861e193212d0a98aa1decdcf827e9882f8 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicm@openbsd.org>
Date: Tue, 18 Aug 2009 21:18:20 +0000
Subject: [PATCH] Move another expensive options test to after a cheaper timer
 check/update.

---
 names.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/names.c b/names.c
index 172dc496..915d06bf 100644
--- a/names.c
+++ b/names.c
@@ -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