aboutsummaryrefslogtreecommitdiff
path: root/names.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-08-28 16:01:09 +0100
committerThomas Adam <thomas@xteddy.org>2015-08-28 16:01:09 +0100
commit486421ceff1b4d618d84ac3cb8c4dd9135b7960d (patch)
tree5ff6d44f3a7f1dabd9a40d0fa7a9176190a9e131 /names.c
parent84eabb2658f9ad1bec81344aa425f66a903c931d (diff)
parentb0940bdf5460ec3324254b5df68b5386513641b2 (diff)
downloadrtmux-486421ceff1b4d618d84ac3cb8c4dd9135b7960d.tar.gz
rtmux-486421ceff1b4d618d84ac3cb8c4dd9135b7960d.tar.bz2
rtmux-486421ceff1b4d618d84ac3cb8c4dd9135b7960d.zip
Merge branch 'obsd-master'
Diffstat (limited to 'names.c')
-rw-r--r--names.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/names.c b/names.c
index 0a3af903..aa0673ea 100644
--- a/names.c
+++ b/names.c
@@ -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);