diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-17 16:25:21 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-17 16:25:21 +0000 |
| commit | ae8dc2809e8e31ec331172387ead370a0cc2dae2 (patch) | |
| tree | 3c67e577c1fd0c44a9ab5d6b96b3994fbde21697 /apps/app_queue.c | |
| parent | 7506a73989aac49a6732e789eeec8f3aed321fa0 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@247170 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_queue.c')
| -rw-r--r-- | apps/app_queue.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index 6794dc31a..7302a462a 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2857,9 +2857,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 { |