summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/names.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2015-08-28 13:26:41 +0000
committernicm <nicm@openbsd.org>2015-08-28 13:26:41 +0000
commit5b9cc8aac4e28ad6f22b4ea22d6319872e8b8e90 (patch)
treec00f08fc1b303bdaf10ae5467f7013362f00c2e6 /usr.bin/tmux/names.c
parentRemove unused prototypes. (diff)
downloadwireguard-openbsd-5b9cc8aac4e28ad6f22b4ea22d6319872e8b8e90.tar.xz
wireguard-openbsd-5b9cc8aac4e28ad6f22b4ea22d6319872e8b8e90.zip
Check changed flag after restarting timer.
Diffstat (limited to 'usr.bin/tmux/names.c')
-rw-r--r--usr.bin/tmux/names.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/names.c b/usr.bin/tmux/names.c
index 56ae335a2c7..1091d26f83b 100644
--- a/usr.bin/tmux/names.c
+++ b/usr.bin/tmux/names.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: names.c,v 1.25 2015/08/28 07:49:24 nicm Exp $ */
+/* $OpenBSD: names.c,v 1.26 2015/08/28 13:26:41 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -50,10 +50,6 @@ window_name_callback(unused int fd, unused short events, void *data)
if (w->active == NULL)
return;
- if (~w->active->flags & PANE_CHANGED)
- return;
- w->active->flags &= ~PANE_CHANGED;
-
if (!options_get_number(&w->options, "automatic-rename")) {
if (event_initialized(&w->name_timer))
event_del(&w->name_timer);
@@ -61,6 +57,10 @@ window_name_callback(unused int fd, unused short events, void *data)
}
queue_window_name(w);
+ if (~w->active->flags & PANE_CHANGED)
+ return;
+ w->active->flags &= ~PANE_CHANGED;
+
name = format_window_name(w);
if (strcmp(name, w->name) != 0) {
window_set_name(w, name);