From 5b9cc171abdd20a18561c1313fe87c4d739ae038 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Mon, 31 Aug 2009 16:22:02 +0000 Subject: [PATCH] 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 ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@214958 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_local.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/channels/chan_local.c b/channels/chan_local.c index 9642038cb5..65f9578ac9 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -237,6 +237,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; } -- 2.47.2