From afe7034e19d2367fe547cee0e940c5cf1b6da19a Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 31 Aug 2009 16:18:33 +0000 Subject: 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 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@214945 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_local.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'channels/chan_local.c') diff --git a/channels/chan_local.c b/channels/chan_local.c index df1a2c454..4d609afdd 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -236,6 +236,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; } -- cgit v1.2.3