From 04ca0b97280366969f4dc884a403f0e22139f2e7 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Wed, 1 Aug 2007 14:09:45 +0000 Subject: [PATCH] Merged revisions 77854 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r77854 | mmichelson | 2007-08-01 09:08:57 -0500 (Wed, 01 Aug 2007) | 8 lines 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: https://origsvn.digium.com/svn/asterisk/trunk@77855 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_queue.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/app_queue.c b/apps/app_queue.c index fd6d3b27dd..166237f91d 100644 --- a/apps/app_queue.c +++ b/apps/app_queue.c @@ -2494,6 +2494,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); @@ -2526,12 +2527,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);