From 0d2cd2042b941397ae242ce48c43e9abbc0e6b5c Mon Sep 17 00:00:00 2001 From: Georg Hopp Date: Sat, 4 Oct 2014 11:02:01 +0100 Subject: [PATCH] don't use TR_queueEmpty anymore. --- src/event_dispatcher_start.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/event_dispatcher_start.c b/src/event_dispatcher_start.c index 1f2b3b5..6080760 100644 --- a/src/event_dispatcher_start.c +++ b/src/event_dispatcher_start.c @@ -47,14 +47,16 @@ TR_eventDispatcherStart(TR_EventDispatcher this) (TR_EventSubject)this, TR_DISPATCHER_EVENT_HEARTBEAT, NULL); - } else if (TR_queueEmpty(this->events)) { - int evtid = TR_EVD_CLIENT == this->mode - ? TR_DISPATCHER_EVENT_USER_WAIT - : TR_DISPATCHER_EVENT_DATA_WAIT; - - event = TR_eventSubjectEmit((TR_EventSubject)this, evtid, NULL); } else { event = TR_queueGet(this->events); + + if (! event) { + int evtid = TR_EVD_CLIENT == this->mode + ? TR_DISPATCHER_EVENT_USER_WAIT + : TR_DISPATCHER_EVENT_DATA_WAIT; + + event = TR_eventSubjectEmit((TR_EventSubject)this, evtid, NULL); + } } handler_queue_hv = TR_hashGetByVal(