diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-31 16:21:51 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-31 16:21:51 +0000 |
| commit | 36539572bd3b2574b54ae0b4cdb3df9ffa9e7e7f (patch) | |
| tree | 2527ec91ed7ffe20bd38e3928674649eae54b7ed /channels/chan_local.c | |
| parent | 836fd721e28ac608690b56d9cc18dad7cf3ddbc5 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@214957 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_local.c')
| -rw-r--r-- | channels/chan_local.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c index 284b8bc40..ae3f722cd 100644 --- a/channels/chan_local.c +++ b/channels/chan_local.c @@ -209,6 +209,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; } |