From: Joshua Colp <jcolp@digium.com>
Date: Tue, 30 Oct 2007 16:15:23 +0000 (+0000)
Subject: Merged revisions 87571 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1071
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4e38b7cd562fbeea37e74346c01db55dcaac621;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/trunk@87572 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/res/res_features.c b/res/res_features.c
index 298a63e64e..e32a23c696 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;
 		}