[asterisk-commits] mmichelson: branch 1.6.0 r247170 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Feb 17 10:25:21 2010
New Revision: 247170

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=247170
Log:
Merged revisions 247169 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r247169 | mmichelson | 2010-02-17 10:24:54 -0600 (Wed, 17 Feb 2010) | 9 lines
  
  Merged revisions 247168 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r247168 | mmichelson | 2010-02-17 10:24:17 -0600 (Wed, 17 Feb 2010) | 3 lines
    
    Make sure that when autofill is disabled that callers not in the front of the queue cannot place calls.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_queue.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=247170&r1=247169&r2=247170
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Wed Feb 17 10:25:21 2010
@@ -2857,9 +2857,11 @@
 	}
 
 	ao2_unlock(qe->parent);
-
-	/* If the queue entry is within avl [the number of available members] calls from the top ... */
-	if (ch && idx < avl) {
+	/* If the queue entry is within avl [the number of available members] calls from the top ... 
+	 * Autofill and position check added to support autofill=no (as only calls
+	 * from the front of the queue are valid when autofill is disabled)
+	 */
+	if (ch && idx < avl && (qe->parent->autofill || qe->pos == 1)) {
 		ast_debug(1, "It's our turn (%s).\n", qe->chan->name);
 		res = 1;
 	} else {