[asterisk-commits] twilson: branch 1.4 r288746 - /branches/1.4/channels/chan_local.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri Sep 24 10:26:09 2010
New Revision: 288746

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

Modified: branches/1.4/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/channels/chan_local.c?view=diff&rev=288746&r1=288745&r2=288746
==============================================================================
--- branches/1.4/channels/chan_local.c (original)
+++ branches/1.4/channels/chan_local.c Fri Sep 24 10:26:09 2010
@@ -444,7 +444,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);