kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-22 13:25:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 77854 via svnmerge from

Browse Source 
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
This commit is contained in:
Mark Michelson
2007-08-01 14:09:45 +00:00
parent 9aee2bf6c7
commit 04ca0b9728
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/app_queue.c
View File

@@ -2494,6 +2494,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);
@@ -2526,12 +2527,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);