aboutsummaryrefslogtreecommitdiff
path: root/cmd-set-option.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-08-30 21:44:01 +0100
committerThomas Adam <thomas@xteddy.org>2015-08-30 21:44:01 +0100
commitcb89f2f2a197db5bf7e1acc8248f381c6f0410cd (patch)
tree9074f8aa373b1bcb857fee46a47d305152cacf06 /cmd-set-option.c
parent486421ceff1b4d618d84ac3cb8c4dd9135b7960d (diff)
parentb87dc608d9b5b470926aaf77c5956befdfb7bc7b (diff)
downloadrtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.tar.gz
rtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.tar.bz2
rtmux-cb89f2f2a197db5bf7e1acc8248f381c6f0410cd.zip
Merge branch 'obsd-master'
Conflicts: Makefile format.c
Diffstat (limited to 'cmd-set-option.c')
-rw-r--r--cmd-set-option.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/cmd-set-option.c b/cmd-set-option.c
index 56ca91e0..98ab2513 100644
--- a/cmd-set-option.c
+++ b/cmd-set-option.c
@@ -180,14 +180,14 @@ cmd_set_option_exec(struct cmd *self, struct cmd_q *cmdq)
if (strcmp(oe->name, "automatic-rename") == 0) {
RB_FOREACH(w, windows, &windows) {
if (options_get_number(&w->options, "automatic-rename"))
- queue_window_name(w);
- else if (event_initialized(&w->name_timer))
- evtimer_del(&w->name_timer);
+ w->active->flags |= PANE_CHANGED;
}
}
if (strcmp(oe->name, "status") == 0 ||
strcmp(oe->name, "status-interval") == 0)
status_timer_start_all();
+ if (strcmp(oe->name, "monitor-silence") == 0)
+ alerts_reset_all();
/* Update sizes and redraw. May not need it but meh. */
recalculate_sizes();