From 04f28eeb73b486652c117b4ceffa126fbb412cb9 Mon Sep 17 00:00:00 2001 From: file Date: Tue, 30 Oct 2007 16:15:23 +0000 Subject: [PATCH] Merged revisions 87571 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r87571 | file | 2007-10-30 13:13:39 -0300 (Tue, 30 Oct 2007) | 4 lines Add two more checks before printing out a warning message about bridging. If either channel has hungup of course the bridge will have failed. (closes issue #10009) Reported by: dimas ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@87572 f38db490-d61c-443f-a65b-d21fe96a405b --- res/res_features.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/res_features.c b/res/res_features.c index 298a63e64..e32a23c69 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1887,8 +1887,8 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast } } if (res < 0) { - if (!ast_test_flag(chan, AST_FLAG_ZOMBIE) && !ast_test_flag(peer, AST_FLAG_ZOMBIE)) - ast_log(LOG_WARNING, "Bridge failed on channels %s and %s, res = %d\n", chan->name, peer->name, res); + if (!ast_test_flag(chan, AST_FLAG_ZOMBIE) && !ast_test_flag(peer, AST_FLAG_ZOMBIE) && !ast_check_hangup(chan) && !ast_check_hangup(peer)) + ast_log(LOG_WARNING, "Bridge failed on channels %s and %s\n", chan->name, peer->name); return -1; }