aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-01 23:07:54 +0000
committerautomerge <automerge@f38db490-d61c-443f-a65b-d21fe96a405b>2007-03-01 23:07:54 +0000
commit26d31bd1e886cdcde7c2177916bfef9154c98c98 (patch)
tree2ec4eb265a78905712f228e0428d1491693bd889
parent6a43f8f4233644160d5d55bd50a497d975aa4a38 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@57362 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_local.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c
index b3bf3b24c..df442a0ad 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -187,7 +187,7 @@ static void check_bridge(struct local_pvt *p, int isoutbound)
{
if (p->alreadymasqed || p->nooptimization)
return;
- if (!p->chan || !p->owner)
+ if (!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,