diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-08-20 11:44:18 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-08-20 11:44:18 +0000 |
| commit | d3da62d53a4f8df0db315b2c23601e6c538cbb06 (patch) | |
| tree | 8218a2de07670db3fa19c18d71ce1553bfe038fa | |
| parent | b644b175993b90803774859953d18618b921daa9 (diff) | |
| download | rtmux-d3da62d53a4f8df0db315b2c23601e6c538cbb06.tar.gz rtmux-d3da62d53a4f8df0db315b2c23601e6c538cbb06.tar.bz2 rtmux-d3da62d53a4f8df0db315b2c23601e6c538cbb06.zip | |
Sync OpenBSD patchset 273:
Move another expensive options test to after a cheaper timer check/update.
| -rw-r--r-- | names.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -1,4 +1,4 @@ -/* $Id: names.c,v 1.13 2009-08-19 09:04:48 nicm Exp $ */ +/* $Id: names.c,v 1.14 2009-08-20 11:44:18 tcunha 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 |