From e65c5ad56cdb2f44be271796d07f70b8b9d3e82c Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Thu, 12 Apr 2012 12:44:26 +0000 Subject: [PATCH] Sync OpenBSD patchset 1093: Turn automatic-rename off properly if turned off by renaming a window. Reported by Romain Francoise. --- names.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/names.c b/names.c index d077abe7..eea711dc 100644 --- a/names.c +++ b/names.c @@ -49,7 +49,12 @@ window_name_callback(unused int fd, unused short events, void *data) struct window *w = data; char *name, *wname; - queue_window_name(w); /* stopped when option turned off */ + if (!options_get_number(&w->options, "automatic-rename")) { + if (event_initialized(&w->name_timer)) + event_del(&w->name_timer); + return; + } + queue_window_name(w); if (w->active->screen != &w->active->base) name = NULL;