diff options
| author | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-08-31 16:18:33 +0000 |
|---|---|---|
| committer | Tilghman Lesher <tilghman@meg.abyt.es> | 2009-08-31 16:18:33 +0000 |
| commit | afe7034e19d2367fe547cee0e940c5cf1b6da19a (patch) | |
| tree | 9ac89fa4e389a0b56a033f34ff7c754d8840bae1 | |
| parent | e1d799cf9e0fefeed2eeae75ef23bf00f668f8e3 (diff) | |
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
| -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 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; } |