automerge commit

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index be86840fddb59ec88dabdd01306f31f777797376..528cd01f70457db1e9e176102a430de75f7bdf3b 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -10548,7 +10548,7 @@ static int attempt_transfer(struct sip_pvt *p1, struct sip_pvt *p2)
        bridgea = ast_bridged_channel(chana);
        bridgeb = ast_bridged_channel(chanb);
        
-       if (bridgea) {
+       if (bridgea && (bridgea == chana->_bridge)) {
                peera = chana;
                peerb = chanb;
                peerc = bridgea;