summaryrefslogtreecommitdiff
path: root/apps/app_queue.c
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2008-01-30 15:27:14 +0000
committerMark Michelson <mmichelson@digium.com>2008-01-30 15:27:14 +0000
commit28b48d2214b6a2852da5e08f6a785172995db938 (patch)
treeb60a5ad3d762a8d898e09eea40a99cfe5816313e /apps/app_queue.c
parent9e7a9c3292fd1702f6ef87ae61d93d1b8023e1ba (diff)
Merged revisions 101216 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r101216 | mmichelson | 2008-01-30 09:23:00 -0600 (Wed, 30 Jan 2008) | 5 lines Fix a logic error with regards to autofill. Prior to this change, it was possible for a caller to go out of turn if autofill were enabled and callers ahead in the queue were attempting to call a member. This change fixes this. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@101217 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_queue.c')
-rw-r--r--apps/app_queue.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 27d3f195b..9e1d9066e 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2666,8 +2666,9 @@ static int is_our_turn(struct queue_ent *qe)
ast_debug(1, "There are %d available members.\n", avl);
- while ((idx < avl) && (ch) && !ch->pending && (ch != qe)) {
- idx++;
+ while ((idx < avl) && (ch) && (ch != qe)) {
+ if (!ch->pending)
+ idx++;
ch = ch->next;
}