From c318a06f14cd44b10c0707ba9f7060da77d385b9 Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Thu, 31 Mar 2005 19:06:08 +0000 Subject: Fix strict mode for queues (bug #3913) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5319 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apps') diff --git a/apps/app_queue.c b/apps/app_queue.c index 78783563d..52a59d50a 100755 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -489,7 +489,7 @@ static int join_queue(char *queuename, struct queue_ent *qe, enum queue_result * stat = get_member_status(q); if (!q->joinempty && (stat == QUEUE_NO_MEMBERS)) *reason = QUEUE_JOINEMPTY; - else if ((q->joinempty == QUEUE_EMPTY_NORMAL) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) + else if ((q->joinempty == QUEUE_EMPTY_STRICT) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) *reason = QUEUE_JOINUNAVAIL; else if (q->maxlen && (q->count >= q->maxlen)) *reason = QUEUE_FULL; @@ -1343,7 +1343,7 @@ static int wait_our_turn(struct queue_ent *qe, int ringing, enum queue_result *r } /* leave the queue if no reachable agents, if enabled */ - if ((qe->parent->leavewhenempty == QUEUE_EMPTY_NORMAL) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) { + if ((qe->parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) { *reason = QUEUE_LEAVEUNAVAIL; leave_queue(qe); break; @@ -2418,7 +2418,7 @@ check_turns: } /* leave the queue if no reachable agents, if enabled */ - if ((qe.parent->leavewhenempty == QUEUE_EMPTY_NORMAL) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) { + if ((qe.parent->leavewhenempty == QUEUE_EMPTY_STRICT) && (stat == QUEUE_NO_REACHABLE_MEMBERS)) { reason = QUEUE_LEAVEUNAVAIL; res = 0; break; -- cgit v1.2.3