aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-19 19:08:51 +0000
committermmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b>2008-08-19 19:08:51 +0000
commit365e8afa06b758217bd667f80808dc12b152a268 (patch)
tree38fe203d3608c576b5a00ad7c25f0a11b776b295
parentcc6792330fa53ee99ea5c221a30c27fb76265769 (diff)
Manually add revision 138887 from trunk to the 1.6.0
branch. I had misunderstood the policy for when to merge to 1.6.0 since it moved to rc status. git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@138890 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_chanspy.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 126e1815a..b2cb3defa 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -772,6 +772,8 @@ exit:
ast_channel_setoption(chan, AST_OPTION_TXGAIN, &zero_volume, sizeof(zero_volume), 0);
+ ast_mutex_lock(&chanspy_ds.lock);
+ ast_mutex_unlock(&chanspy_ds.lock);
ast_mutex_destroy(&chanspy_ds.lock);
return res;