aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-31 16:16:52 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2009-08-31 16:16:52 +0000
commitfbc2bbdd0114641e407e495be4d4df1170ca24cc (patch)
treeaba2b8521bd41642b06adbf6a67ad00cccbee9da
parentcd8ab419b5d79bd506ca1329cb3474d22c845acf (diff)
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.4@214940 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--channels/chan_local.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/channels/chan_local.c b/channels/chan_local.c
index aa81af51c..9c2f7e600 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -204,6 +204,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;
}