diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-29 16:19:01 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-06-29 16:19:01 +0000 |
| commit | 3a102b3b9c4d1f0395bee419494584072c7e1afc (patch) | |
| tree | 1aaf7230848e5be95f33799e1ac709e4346a33f0 /main | |
| parent | 532bf8f4aae125e97c80073fcbbbc55c2784057b (diff) | |
Merged revisions 325545 via svnmerge from
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: http://svn.digium.com/svn/asterisk/trunk@325547 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/main/channel.c b/main/channel.c index 57629dbc5..ed84da1e6 100644 --- a/main/channel.c +++ b/main/channel.c @@ -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 */ |