Turn automatic-rename off properly if turned off by renaming a

window. Reported by Romain Francoise.
This commit is contained in:
Nicholas Marriott 2012-04-11 07:45:30 +00:00
parent 6703ca8d26
commit c6e0af9bdb

View File

@ -49,7 +49,12 @@ window_name_callback(unused int fd, unused short events, void *data)
struct window *w = data; struct window *w = data;
char *name, *wname; 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) if (w->active->screen != &w->active->base)
name = NULL; name = NULL;