Merged revisions 288747 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.6.2

................
  r288747 | twilson | 2010-09-24 08:37:39 -0700 (Fri, 24 Sep 2010) | 12 lines

  Merged revisions 288746 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r288746 | twilson | 2010-09-24 08:26:09 -0700 (Fri, 24 Sep 2010) | 5 lines

    Don't fail a masquerade if it is already being hung up

    This avoids noise on some Local channel situations where we don't use /n.
    Thanks to Alec Davis for the suggestion.
  ........
................

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

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 343e41f90774d72d71e1e640a28bbaef2b6ff55e..6cee48f9ebe0738463ec35f0c2f5137a6893814c 100644 (file)
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -570,7 +570,7 @@ static int local_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
                p->chan = newchan;
 
        /* Do not let a masquerade cause a Local channel to be bridged to itself! */
-       if (p->owner->_bridge == p->chan || p->chan->_bridge == p->owner) {
+       if (!ast_check_hangup(newchan) && (p->owner->_bridge == p->chan || p->chan->_bridge == p->owner)) {
                ast_log(LOG_WARNING, "You can not bridge a Local channel to itself!\n");
                ast_mutex_unlock(&p->lock);
                ast_queue_hangup(newchan);