aboutsummaryrefslogtreecommitdiff
path: root/window.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2012-04-10 09:57:08 +0000
committerTiago Cunha <tcunha@gmx.com>2012-04-10 09:57:08 +0000
commitce67a44a94a9d524ec8f45a452dde37fd7ea991f (patch)
tree39a8d4dc31815afe7e4cdc5d1963d2931d63fa63 /window.c
parent14e5cdf02e5a618733c0ba1e11563c851602ec83 (diff)
downloadrtmux-ce67a44a94a9d524ec8f45a452dde37fd7ea991f.tar.gz
rtmux-ce67a44a94a9d524ec8f45a452dde37fd7ea991f.tar.bz2
rtmux-ce67a44a94a9d524ec8f45a452dde37fd7ea991f.zip
Sync OpenBSD patchset 1091:
Do not fire name timer when automatic-rename is off, from Tim Ruehsen a while ago.
Diffstat (limited to 'window.c')
-rw-r--r--window.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/window.c b/window.c
index 800a716c..fac56dc6 100644
--- a/window.c
+++ b/window.c
@@ -294,9 +294,9 @@ window_create1(u_int sx, u_int sy)
w->sx = sx;
w->sy = sy;
- queue_window_name(w);
-
options_init(&w->options, &global_w_options);
+ if (options_get_number(&w->options, "automatic-rename"))
+ queue_window_name(w);
for (i = 0; i < ARRAY_LENGTH(&windows); i++) {
if (ARRAY_ITEM(&windows, i) == NULL) {