diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-01 22:21:44 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-03-01 22:21:44 +0000 |
| commit | 4334ea36f17413e3718a204ef514e559e498bb9e (patch) | |
| tree | 210241db0ba3abc991a59f6cb65dc33259fbafc0 /channels/chan_local.c | |
| parent | 6b218a3c7c967b849a3f39169c01ee1a0c367000 (diff) | |
Merged revisions 57317 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r57317 | file | 2007-03-01 17:19:32 -0500 (Thu, 01 Mar 2007) | 2 lines
Don't even attempt to optimize things when a proxy channel is involved. It will just explode in weird and unexplaineable ways. (issue #9175 reported by clegall_proformatique)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@57318 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_local.c')
| -rw-r--r-- | channels/chan_local.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 4f4b75c5f..df573390a 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -220,7 +220,7 @@ static int local_answer(struct ast_channel *ast) static void check_bridge(struct local_pvt *p, int isoutbound) { - if (ast_test_flag(p, LOCAL_ALREADY_MASQED) || ast_test_flag(p, LOCAL_NO_OPTIMIZATION) || !p->chan || !p->owner) + if (ast_test_flag(p, LOCAL_ALREADY_MASQED) || ast_test_flag(p, LOCAL_NO_OPTIMIZATION) || !p->chan || !p->owner || (p->chan->_bridge != ast_bridged_channel(p->chan))) return; /* only do the masquerade if we are being called on the outbound channel, |