From: Mark Michelson <mmichelson@digium.com>
Date: Fri, 25 Apr 2008 19:33:27 +0000 (+0000)
Subject: Merged revisions 114662 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~2379
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e1a67cfeb606234002109fe235f5d6b5205fa34;p=thirdparty%2Fasterisk.git

Merged revisions 114662 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114662 | mmichelson | 2008-04-25 14:32:02 -0500 (Fri, 25 Apr 2008) | 4 lines

Move the unlock of the spyee channel to outside the start_spying() function so that
the channel is not unlocked twice when using whisper mode.


........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c
index 641e32e0c0..8450c927e9 100644
--- a/apps/app_chanspy.c
+++ b/apps/app_chanspy.c
@@ -239,12 +239,9 @@ static int start_spying(struct ast_channel *chan, const char *spychan_name, stru
 
 	res = ast_audiohook_attach(chan, audiohook);
 
-	if (!res && ast_test_flag(chan, AST_FLAG_NBRIDGE) && (peer = ast_bridged_channel(chan))) {
-		ast_channel_unlock(chan);
+	if (!res && ast_test_flag(chan, AST_FLAG_NBRIDGE) && (peer = ast_bridged_channel(chan))) { 
 		ast_softhangup(peer, AST_SOFTHANGUP_UNBRIDGE);
-	} else
-		ast_channel_unlock(chan);
-
+	}
 	return res;
 }
 
@@ -293,16 +290,18 @@ static int channel_spy(struct ast_channel *chan, struct chanspy_ds *spyee_chansp
 
 	ast_audiohook_init(&csth.spy_audiohook, AST_AUDIOHOOK_TYPE_SPY, "ChanSpy");
 
-	if (start_spying(spyee, spyer_name, &csth.spy_audiohook)) { /* Unlocks spyee */
+	if (start_spying(spyee, spyer_name, &csth.spy_audiohook)) {
 		ast_audiohook_destroy(&csth.spy_audiohook);
+		ast_channel_unlock(spyee);
 		return 0;
 	}
 
 	if (ast_test_flag(flags, OPTION_WHISPER)) {
 		ast_audiohook_init(&csth.whisper_audiohook, AST_AUDIOHOOK_TYPE_WHISPER, "ChanSpy");
-		start_spying(spyee, spyer_name, &csth.whisper_audiohook); /* Unlocks spyee */
+		start_spying(spyee, spyer_name, &csth.whisper_audiohook);
 	}
 
+	ast_channel_unlock(spyee);
 	spyee = NULL;
 
 	csth.volfactor = *volfactor;