diff options
author | Joshua Colp <jcolp@digium.com> | 2007-07-05 14:22:58 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2007-07-05 14:22:58 +0000 |
commit | f4943f32116dbb359b03d72b8c3d3c470c657811 (patch) | |
tree | f82f0dd4f0b381ceb9924be2cfb07147ef6d275a /apps | |
parent | 92de3e5939e7f6bf22b2b98094831ea7884de485 (diff) |
Merged revisions 73355 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r73355 | file | 2007-07-05 11:21:44 -0300 (Thu, 05 Jul 2007) | 10 lines
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: https://origsvn.digium.com/svn/asterisk/trunk@73359 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r-- | apps/app_chanspy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index f30631450..8081fb1d8 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -425,9 +425,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); |