make framehooks prevent native bridging (for real this time)

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

diff --git a/main/channel.c b/main/channel.c
index ffb0595d56c6ccdb95790539e425a2fbe7790c4f..fdddd51ce0ebfa243c3ca1f5ecc75b0c651d4524 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -7287,6 +7287,7 @@ enum ast_bridge_result ast_channel_bridge(struct ast_channel *c0, struct ast_cha
                    (c0->tech->bridge == c1->tech->bridge) &&
                    !c0->monitor && !c1->monitor &&
                    !c0->audiohooks && !c1->audiohooks &&
+                   ast_framehook_list_is_empty(c0->framehooks) && ast_framehook_list_is_empty(c1->framehooks) &&
                    !c0->masq && !c0->masqr && !c1->masq && !c1->masqr) {
                        int timeoutms = to - 1000 > 0 ? to - 1000 : to;
                        /* Looks like they share a bridge method and nothing else is in the way */