From: Mark Michelson <mmichelson@digium.com>
Date: Wed, 1 Aug 2007 14:08:57 +0000 (+0000)
Subject: Fixes an issue I introduced to queues wherein a queue with joinempty=yes would kick... 
X-Git-Tag: 1.4.10~46
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5739eba48e2a0ef6a808f75b322b867af866b828;p=thirdparty%2Fasterisk.git

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/branches/1.4@77854 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index e257493750..7be6fca93a 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);