[asterisk-commits] twilson: branch 1.8 r288748 - in /branches/1.8: ./ channels/chan_local.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri Sep 24 11:02:27 2010
New Revision: 288748

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=288748
Log:
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.
  ........
................

Modified:
    branches/1.8/   (props changed)
    branches/1.8/channels/chan_local.c

Propchange: branches/1.8/
------------------------------------------------------------------------------
Binary property 'branch-1.6.2-merged' - no diff available.

Modified: branches/1.8/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/channels/chan_local.c?view=diff&rev=288748&r1=288747&r2=288748
==============================================================================
--- branches/1.8/channels/chan_local.c (original)
+++ branches/1.8/channels/chan_local.c Fri Sep 24 11:02:27 2010
@@ -570,7 +570,7 @@
 		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);