summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2008-02-28 20:14:38 +0000
committerMark Michelson <mmichelson@digium.com>2008-02-28 20:14:38 +0000
commitf0379886c5ba872b3fe082fcde00067f6b9748dc (patch)
treee36d3a46d3222f8d3cce861fb80d1b72006ff97b /apps
parentbeb7a540c15585662bba7de5138c437562fae2dd (diff)
Merged revisions 105059 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r105059 | mmichelson | 2008-02-28 14:11:57 -0600 (Thu, 28 Feb 2008) | 6 lines When using autofill, members who are in use should be counted towards the number of available members to call if ringinuse is set to yes. Thanks to jmls who brought this issue up on IRC ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105061 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 5f7e08ca0..1e4fdf591 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2687,6 +2687,10 @@ static int is_our_turn(struct queue_ent *qe)
struct ao2_iterator mem_iter = ao2_iterator_init(qe->parent->members, 0);
while ((cur = ao2_iterator_next(&mem_iter))) {
switch (cur->status) {
+ case AST_DEVICE_INUSE:
+ if (!qe->parent->ringinuse)
+ break;
+ /* else fall through */
case AST_DEVICE_NOT_INUSE:
case AST_DEVICE_UNKNOWN:
if (!cur->paused)