From: Terry Wilson <twilson@digium.com>
Date: Fri, 24 Sep 2010 16:11:19 +0000 (+0000)
Subject: Merged revisions 288748 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2275
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e473de5e24ffb6406786f817a499e4ad624f988;p=thirdparty%2Fasterisk.git

Merged revisions 288748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288748 | twilson | 2010-09-24 09:02:27 -0700 (Fri, 24 Sep 2010) | 19 lines

  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/trunk@288749 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 343e41f907..6cee48f9eb 100644
--- 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);