aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2007-08-01 14:08:57 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2007-08-01 14:08:57 +0000
commitf6aab71cc9c0b6d795c24b37456d173dffc736e2 (patch)
treeb9a7964786496b71c83bfde50eba7943e195ceaa /apps
parentd8e14b731d6bc7198529b487477b35c2b4a1acb0 (diff)
Fixes an issue I introduced to queues wherein a queue with joinempty=yes would kick people out of the queue because of erroneously
thinking the 'n' option was in use. (closes issue #10320, reported by jfitzgibbon, patched by me, tested by blitzrage and me) Thank you blitzrage for all the testing you've done lately with queues! It's much appreciated! git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@77854 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index e25749375..7be6fca93 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2377,6 +2377,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
char vars[2048];
int forwardsallowed = 1;
int callcompletedinsl;
+ int noption = 0;
memset(&bridge_config, 0, sizeof(bridge_config));
time(&now);
@@ -2409,12 +2410,16 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
(*go_on)++;
else
*go_on = qe->parent->membercount;
+ noption = 1;
break;
case 'i':
forwardsallowed = 0;
break;
}
+ if(!noption)
+ *go_on = -1;
+
/* Hold the lock while we setup the outgoing calls */
if (use_weight)
AST_LIST_LOCK(&queues);