aboutsummaryrefslogtreecommitdiff
path: root/status.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2012-03-18 01:59:34 +0000
committerTiago Cunha <tcunha@gmx.com>2012-03-18 01:59:34 +0000
commit0987d552315b5781157846c23eee0ddaab4702d7 (patch)
treeae795f2be215e431d562f6985f1430c9022eaba7 /status.c
parent5aa28473dd76c6c10c5e2e9d303250c8f8881e05 (diff)
downloadrtmux-0987d552315b5781157846c23eee0ddaab4702d7.tar.gz
rtmux-0987d552315b5781157846c23eee0ddaab4702d7.tar.bz2
rtmux-0987d552315b5781157846c23eee0ddaab4702d7.zip
Sync OpenBSD patchset 1057:
Check event_initialized before event_del if event may not have been set up; libevent2 complains about this. Reported by Moriyoshi Koizumi.
Diffstat (limited to 'status.c')
-rw-r--r--status.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/status.c b/status.c
index 7f10ba0b..8a5f20b0 100644
--- a/status.c
+++ b/status.c
@@ -776,7 +776,8 @@ status_message_set(struct client *c, const char *fmt, ...)
tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L;
- evtimer_del(&c->message_timer);
+ if (event_initialized (&c->message_timer))
+ evtimer_del(&c->message_timer);
evtimer_set(&c->message_timer, status_message_callback, c);
evtimer_add(&c->message_timer, &tv);