[asterisk-commits] tilghman: branch 1.6.0 r214957 - in /branches/1.6.0: ./ channels/chan_local.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Aug 31 11:21:51 2009
New Revision: 214957

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

................
  r214945 | tilghman | 2009-08-31 11:18:33 -0500 (Mon, 31 Aug 2009) | 14 lines
  
  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:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_local.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_local.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_local.c?view=diff&rev=214957&r1=214956&r2=214957
==============================================================================
--- branches/1.6.0/channels/chan_local.c (original)
+++ branches/1.6.0/channels/chan_local.c Mon Aug 31 11:21:51 2009
@@ -209,6 +209,9 @@
 		return and destroy p.  */
 		ast_mutex_unlock(&p->lock);
 		p = local_pvt_destroy(p);
+		if (other) {
+			ast_channel_unlock(other);
+		}
 		return -1;
 	}