mirror of
https://github.com/tmux/tmux.git
synced 2024-12-14 02:48:47 +00:00
Sync OpenBSD patchset 273:
Move another expensive options test to after a cheaper timer check/update.
This commit is contained in:
parent
b644b17599
commit
d3da62d53a
7
names.c
7
names.c
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user