diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-07-06 04:52:35 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-07-06 04:52:35 +0200 |
| commit | 916e420bf0c8db7a8cb1f60557cd2807652142cf (patch) | |
| tree | ece8aaf3f22e6e1cc545a858cad9e05c34713426 /main/channel.c | |
| parent | 9364aaccb699c6d19ac2cbe760c208b34ba7838a (diff) | |
| parent | 357b97fb29d196a5f336d6a2879278ea135ab08c (diff) | |
Merge branch 'master' of 192.168.0.100:/repos/git/asterisk
Diffstat (limited to 'main/channel.c')
| -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 */ |