diff options
| author | Mark Michelson <mmichelson@digium.com> | 2007-08-01 14:09:45 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2007-08-01 14:09:45 +0000 |
| commit | 04ca0b97280366969f4dc884a403f0e22139f2e7 (patch) | |
| tree | 72d538cb3415d68455639d5e6d93281bd6fc71c1 /apps/app_queue.c | |
| parent | 9aee2bf6c7e1acc177a7190685e29cd51a401682 (diff) | |
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
Diffstat (limited to 'apps/app_queue.c')
| -rw-r--r-- | apps/app_queue.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c index fd6d3b27d..166237f91 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); |