From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 31 Aug 2009 16:16:52 +0000 (+0000)
Subject: Also unlock the "other" channel, when returning, due to glare.
X-Git-Tag: 1.4.26.2~4^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa27e8dffac83441e08e568f39fef0aa494fd99e;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@214940 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_local.c b/channels/chan_local.c
index aa81af51c1..9c2f7e6006 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -204,6 +204,9 @@ static int local_queue_frame(struct local_pvt *p, int isoutbound, struct ast_fra
 		return and destroy p.  */
 		ast_mutex_unlock(&p->lock);
 		p = local_pvt_destroy(p);
+		if (other) {
+			ast_channel_unlock(other);
+		}
 		return -1;
 	}