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 b3bf3b24c5e562781c9e7bdb5feb2cb90ffe2dae..df442a0ad5e103aa5976ad55fc556b32ae0da061 100644 (file)
--- 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,