From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 30 Jan 2008 15:27:14 +0000 (+0000)
Subject: Merged revisions 101216 via svnmerge from
X-Git-Tag: 1.6.0-beta3~2^2~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28b48d2214b6a2852da5e08f6a785172995db938;p=thirdparty%2Fasterisk.git

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
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 27d3f195b2..9e1d9066ea 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;			
 		}