aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authormarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-03-31 19:06:08 +0000
committermarkster <markster@f38db490-d61c-443f-a65b-d21fe96a405b>2005-03-31 19:06:08 +0000
commit998a41aadabc26fc01a7a3cba829f3f543093a2c (patch)
tree015b3aeb7a23a6d254b005ddad897f75c3ec1a15 /apps
parentb08d26f4ff632e59a829d806d325f70a6acf7b83 (diff)
Fix strict mode for queues (bug #3913)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5319 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rwxr-xr-xapps/app_queue.c6
1 files changed, 3 insertions, 3 deletions
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;