Merged revisions 325545 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Wed, 29 Jun 2011 16:19:01 +0000 (16:19 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Wed, 29 Jun 2011 16:19:01 +0000 (16:19 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r325545 | mnicholson | 2011-06-29 11:18:39 -0500 (Wed, 29 Jun 2011) | 2 lines

  make framehooks prevent native bridging (for real this time)
........

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

main/channel.c

index 57629db..ed84da1 100644 (file)
@@ -7499,6 +7499,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 */