diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-08-18 21:18:21 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-08-18 21:18:21 +0000 |
| commit | ad22d02bf2ebfca023418061864cc7b04a54abfc (patch) | |
| tree | 6f5d3135d36d5543259492be7c7de8feb4bed79f /usr.bin | |
| parent | 8776fa95e92f90266bdfd625a0b403359dc9d8c3 (diff) | |
Move another expensive options test to after a cheaper timer check/update.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/tmux/names.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/tmux/names.c b/usr.bin/tmux/names.c index 835b61b54de..95fb8cb4dfa 100644 --- a/usr.bin/tmux/names.c +++ b/usr.bin/tmux/names.c @@ -1,4 +1,4 @@ -/* $OpenBSD: names.c,v 1.4 2009/07/08 05:26:45 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 |