diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-30 15:27:14 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-30 15:27:14 +0000 |
commit | ae72a3b20e3dceb79544b47ad94c26dba737ec65 (patch) | |
tree | b60a5ad3d762a8d898e09eea40a99cfe5816313e /apps | |
parent | bed6564482a6a779361df9ac237cfb35a3869fa3 (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: http://svn.digium.com/svn/asterisk/trunk@101217 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_queue.c | 5 |
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; } |