summaryrefslogtreecommitdiffstats
path: root/names.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@openbsd.org>2009-08-18 21:18:20 +0000
committerNicholas Marriott <nicm@openbsd.org>2009-08-18 21:18:20 +0000
commit8b7be5861e193212d0a98aa1decdcf827e9882f8 (patch)
treeb6b7e3027f4842c403f91cc0ff26cc40d51048ee /names.c
parentfa617467b12ca519b58878343c604026058d388d (diff)
Move another expensive options test to after a cheaper timer check/update.
Diffstat (limited to 'names.c')
-rw-r--r--names.c5
1 files 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