aboutsummaryrefslogtreecommitdiff
path: root/names.c
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2009-08-19 09:00:06 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2009-08-19 09:00:06 +0000
commit620402a833a4e42590a26390d2b7a39fd39e3ea9 (patch)
treee51054af412411f92f070c5cdc5b4fa53c79e1a0 /names.c
parent3f7e2589cdc27b59499806caa4d945f5c808d360 (diff)
downloadrtmux-620402a833a4e42590a26390d2b7a39fd39e3ea9.tar.gz
rtmux-620402a833a4e42590a26390d2b7a39fd39e3ea9.tar.bz2
rtmux-620402a833a4e42590a26390d2b7a39fd39e3ea9.zip
This is a better fix for OS X stupidity.
Diffstat (limited to 'names.c')
-rw-r--r--names.c7
1 files changed, 4 insertions, 3 deletions
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