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

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@247171 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index b0ece01f22f2f075cc922db37f67d6cf05ef63c0..21b851983026073331ef68796fe32b20b39795ee 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2920,9 +2920,11 @@ static int is_our_turn(struct queue_ent *qe)
        }
 
        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 {