diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-31 16:22:02 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-31 16:22:02 +0000 |
| commit | 770f41392910aeb11d455ee33540afd8a47b140d (patch) | |
| tree | 3ae450cb6f3fa9b345234e4ad4504b133485934e /channels | |
| parent | a8d6155c5f20f3fcc8f46d978dc465eb19819200 (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.1@214958 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 9642038cb..65f9578ac 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; } |