[asterisk-commits] mmichelson: trunk r101217 - in /trunk: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jan 30 09:27:14 2008
New Revision: 101217

URL: http://svn.digium.com/view/asterisk?view=rev&rev=101217
Log:
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.


........

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=101217&r1=101216&r2=101217
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Wed Jan 30 09:27:14 2008
@@ -2666,8 +2666,9 @@
 
 		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;			
 		}