mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 20:20:07 +00:00
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
This commit is contained in:
@@ -2377,6 +2377,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
|
|||||||
char vars[2048];
|
char vars[2048];
|
||||||
int forwardsallowed = 1;
|
int forwardsallowed = 1;
|
||||||
int callcompletedinsl;
|
int callcompletedinsl;
|
||||||
|
int noption = 0;
|
||||||
|
|
||||||
memset(&bridge_config, 0, sizeof(bridge_config));
|
memset(&bridge_config, 0, sizeof(bridge_config));
|
||||||
time(&now);
|
time(&now);
|
||||||
@@ -2409,12 +2410,16 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
|
|||||||
(*go_on)++;
|
(*go_on)++;
|
||||||
else
|
else
|
||||||
*go_on = qe->parent->membercount;
|
*go_on = qe->parent->membercount;
|
||||||
|
noption = 1;
|
||||||
break;
|
break;
|
||||||
case 'i':
|
case 'i':
|
||||||
forwardsallowed = 0;
|
forwardsallowed = 0;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(!noption)
|
||||||
|
*go_on = -1;
|
||||||
|
|
||||||
/* Hold the lock while we setup the outgoing calls */
|
/* Hold the lock while we setup the outgoing calls */
|
||||||
if (use_weight)
|
if (use_weight)
|
||||||
AST_LIST_LOCK(&queues);
|
AST_LIST_LOCK(&queues);
|
||||||
|
Reference in New Issue
Block a user