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.
This commit is contained in:
Tiago Cunha
2012-03-18 01:59:34 +00:00
parent 5aa28473dd
commit 0987d55231
7 changed files with 22 additions and 11 deletions

View File

@ -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);