summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2006-06-04 03:45:54 +0000
committerKevin P. Fleming <kpfleming@digium.com>2006-06-04 03:45:54 +0000
commit998eacf17f30f6b92da882604c0861ae4566ca84 (patch)
treedea20084aef37faf4c55724632ce555c64e0548b /apps
parent531ed6f2903db478754d18d5f4e6439cdf54ea4d (diff)
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
Diffstat (limited to 'apps')
-rw-r--r--apps/app_queue.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_queue.c b/apps/app_queue.c
index ba3940e48..e7a5ef93a 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);