automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@31951 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 53929b309dd43737da1f98312697f263e4b7961e..6e943f31b6b563a3cf09ea788b60830b19367cce 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -2431,7 +2431,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);