Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam 2017-09-11 22:01:10 +01:00
commit 9a1b9f15a1

View File

@ -142,7 +142,8 @@ alerts_reset(struct window *w)
struct timeval tv;
w->flags &= ~WINDOW_SILENCE;
event_del(&w->alerts_timer);
if (event_initialized(&w->alerts_timer))
event_del(&w->alerts_timer);
timerclear(&tv);
tv.tv_sec = options_get_number(w->options, "monitor-silence");