aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-05 14:21:44 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-07-05 14:21:44 +0000
commit65c550e0f24985527456d6253a77386cebc0e9aa (patch)
treee190947852de1c0b225adf1f2ff362925fd51d30 /apps
parentc4080c36c5faa5a6a329d46e9d89771e3953c811 (diff)
Merged revisions 73349 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r73349 | file | 2007-07-05 11:19:14 -0300 (Thu, 05 Jul 2007) | 2 lines Tweak spy locking. (issue #9951 reported by welles) ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@73355 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_chanspy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index cf1e4759d..ff89ab5c8 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -387,9 +387,10 @@ static int channel_spy(struct ast_channel *chan, struct ast_channel *spyee, int
else
ast_deactivate_generator(chan);
+ csth.spy.status = CHANSPY_DONE;
+
/* If a channel still exists on our spy structure then we need to remove ourselves */
if (csth.spy.chan) {
- csth.spy.status = CHANSPY_DONE;
ast_channel_lock(csth.spy.chan);
ast_channel_spy_remove(csth.spy.chan, &csth.spy);
ast_channel_unlock(csth.spy.chan);