[asterisk-commits] tilghman: trunk r214945 - in /trunk: ./ channels/chan_local.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Aug 31 11:18:33 2009
New Revision: 214945

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=214945
Log:
Merged revisions 214940 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r214940 | tilghman | 2009-08-31 11:16:52 -0500 (Mon, 31 Aug 2009) | 7 lines
  
  Also unlock the "other" channel, when returning, due to glare.
  (closes issue #15787)
   Reported by: tim_ringenbach
   Patches: 
         chan_local.diff uploaded by tim ringenbach (license 540)
   Tested by: tim_ringenbach
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_local.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_local.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_local.c?view=diff&rev=214945&r1=214944&r2=214945
==============================================================================
--- trunk/channels/chan_local.c (original)
+++ trunk/channels/chan_local.c Mon Aug 31 11:18:33 2009
@@ -236,6 +236,9 @@
 		return and destroy p.  */
 		ast_mutex_unlock(&p->lock);
 		p = local_pvt_destroy(p);
+		if (other) {
+			ast_channel_unlock(other);
+		}
 		return -1;
 	}