]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Add two more checks before printing out a warning message about bridging. If either...
authorJoshua Colp <jcolp@digium.com>
Tue, 30 Oct 2007 16:13:39 +0000 (16:13 +0000)
committerJoshua Colp <jcolp@digium.com>
Tue, 30 Oct 2007 16:13:39 +0000 (16:13 +0000)
(closes issue #10009)
Reported by: dimas

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

res/res_features.c

index 50687cb04729d75818c2a14b98690cf948c869c3..1aa1b80210e1bbbecfad5b30b2c02b0c847d6f39 100644 (file)
@@ -1463,8 +1463,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;
                }