circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-14 10:58:48 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 273:

Browse Source 
Move another expensive options test to after a cheaper timer check/update.
This commit is contained in:
Tiago Cunha 2009-08-20 11:44:18 +00:00
parent b644b17599
commit d3da62d53a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
names.c
View File

@ -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> * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@ -42,8 +42,6 @@ set_window_names(void)
w = ARRAY_ITEM(&windows, i); w = ARRAY_ITEM(&windows, i);
if (w == NULL || w->active == NULL) if (w == NULL || w->active == NULL)
continue; continue;
if (!options_get_number(&w->options, "automatic-rename"))
continue;
if (timercmp(&tv, &w->name_timer, <)) if (timercmp(&tv, &w->name_timer, <))
continue; continue;
@ -52,6 +50,9 @@ set_window_names(void)
tv2.tv_usec = NAME_INTERVAL * 1000L; tv2.tv_usec = NAME_INTERVAL * 1000L;
timeradd(&w->name_timer, &tv2, &w->name_timer); timeradd(&w->name_timer, &tv2, &w->name_timer);
if (!options_get_number(&w->options, "automatic-rename"))
continue;
if (w->active->screen != &w->active->base) if (w->active->screen != &w->active->base)
name = NULL; name = NULL;
else else