From: Kevin P. Fleming <kpfleming@digium.com>
Date: Sun, 4 Jun 2006 03:45:54 +0000 (+0000)
Subject: Merged revisions 31921 via svnmerge from
X-Git-Tag: 1.4.0-beta1~1081
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=998eacf17f30f6b92da882604c0861ae4566ca84;p=thirdparty%2Fasterisk.git

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 :-(

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@31922 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_queue.c b/apps/app_queue.c
index ba3940e48d..e7a5ef93ae 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2606,7 +2606,7 @@ static int try_calling(struct queue_ent *qe, const char *options, char *announce
 		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);