aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-18 15:09:19 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-06-18 15:09:19 +0000
commitfdd3e19562cfec77161a5e0a598939f112e5634d (patch)
treedee0e5aee9d26a0c2f34f1ca98dbd1c5ab490a4b
parentf013292870b9b452de88ab3e2a447bebe38ceba3 (diff)
Merged revisions 123652 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r123652 | mmichelson | 2008-06-18 10:08:56 -0500 (Wed, 18 Jun 2008) | 7 lines A portion of the code which handled the 'c' queue option had been removed. No telling when it happened. Anyway, it's back in now and works properly. (Based on issue reported on mailing list) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@123653 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_queue.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 1b08165fd..79d67690d 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -4597,8 +4597,11 @@ stop:
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON",
"%d|%d|%ld", qe.pos, qe.opos,
(long) time(NULL) - qe.start);
+ res = -1;
+ } else if (qcontinue) {
+ reason = QUEUE_CONTINUE;
+ res = 0;
}
- res = -1;
} else if (qe.valid_digits) {
ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHKEY",
"%s|%d", qe.digits, qe.pos);