aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-02-28 20:14:38 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-02-28 20:14:38 +0000
commitd4718af66edfa3f0a64dc8a92cf24c8215fcb635 (patch)
treee36d3a46d3222f8d3cce861fb80d1b72006ff97b
parent6e02d54e7b6ef7f3247c0ac8542fdd676f59f12e (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: http://svn.digium.com/svn/asterisk/trunk@105061 f38db490-d61c-443f-a65b-d21fe96a405b
-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)