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 ba3940e..e7a5ef9 100644 (file)
--- 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);