[svn-commits] trunk r31922 - in /trunk: ./ apps/app_queue.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Sat Jun  3 22:45:54 2006
New Revision: 31922

URL: http://svn.digium.com/view/asterisk?rev=31922&view=rev
Log:
Merged revisions 31921 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r31921 | kpfleming | 2006-06-03 22:43:35 -0500 (Sat, 03 Jun 2006) | 2 lines

return bridge exit logic to what it was before i broke it :-(

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?rev=31922&r1=31921&r2=31922&view=diff
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Sat Jun  3 22:45:54 2006
@@ -2606,7 +2606,7 @@
 		if (bridge != AST_PBX_NO_HANGUP_PEER)
 			ast_hangup(peer);
 		update_queue(qe->parent, member);
-		res = bridge ? -1 : 0;
+		res = bridge ? bridge : 1;
 	}
 out:
 	hangupcalls(outgoing, NULL);