[svn-commits] mmichelson: branch 1.6.0 r123653 - in /branches/1.6.0: ./ apps/app_queue.c

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Jun 18 10:09:19 2008
New Revision: 123653

URL: http://svn.digium.com/view/asterisk?view=rev&rev=123653
Log:
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)


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_queue.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_queue.c?view=diff&rev=123653&r1=123652&r2=123653
==============================================================================
--- branches/1.6.0/apps/app_queue.c (original)
+++ branches/1.6.0/apps/app_queue.c Wed Jun 18 10:09:19 2008
@@ -4597,8 +4597,11 @@
 				ast_queue_log(args.queuename, chan->uniqueid, "NONE", "ABANDON",
 					"%d|%d|%ld", qe.pos, qe.opos,
 					(long) time(NULL) - qe.start);
-			}
-			res = -1;
+				res = -1;
+			} else if (qcontinue) {
+				reason = QUEUE_CONTINUE;
+				res = 0;
+			}
 		} else if (qe.valid_digits) {
 			ast_queue_log(args.queuename, chan->uniqueid, "NONE", "EXITWITHKEY",
 				"%s|%d", qe.digits, qe.pos);