From: Automerge Script <automerge@asterisk.org>
Date: Thu, 1 Mar 2007 23:07:54 +0000 (+0000)
Subject: automerge commit
X-Git-Tag: 1.2.16-netsec~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3a5b0d8e144c84e696910770290b712475c0d75;p=thirdparty%2Fasterisk.git

automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@57362 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_local.c b/channels/chan_local.c
index b3bf3b24c5..df442a0ad5 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,