diff options
| author | Jonathan Rose <jrose@digium.com> | 2014-05-12 22:33:28 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2014-05-12 22:33:28 +0000 |
| commit | 643a7f02d6a8911298c6ddd595521955ca702862 (patch) | |
| tree | 5d09cda4850277e570f7989c25c622d311938696 /apps/app_chanspy.c | |
| parent | d134150be28e9016131b4c0b5c9273ff65cf2084 (diff) | |
app_chanspy: Fix a test that was failing on account of r413551
ASTERISK-23381 #close
ASTERISK-23381 #comment Reported by: Robert Moss
Review: https://reviewboard.asterisk.org/r/3505/
........
Merged revisions 413710 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 413712 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@413713 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps/app_chanspy.c')
| -rw-r--r-- | apps/app_chanspy.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 987eacfb6..306e6e84b 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -725,16 +725,16 @@ static int channel_spy(struct ast_channel *chan, struct ast_autochan *spyee_auto bridge_connected = 1; } - if (!bridge_connected) { - continue; - } - ast_audiohook_lock(&csth.whisper_audiohook); - ast_audiohook_lock(&csth.bridge_whisper_audiohook); ast_audiohook_write_frame(&csth.whisper_audiohook, AST_AUDIOHOOK_DIRECTION_WRITE, f); - ast_audiohook_write_frame(&csth.bridge_whisper_audiohook, AST_AUDIOHOOK_DIRECTION_WRITE, f); ast_audiohook_unlock(&csth.whisper_audiohook); - ast_audiohook_unlock(&csth.bridge_whisper_audiohook); + + if (bridge_connected) { + ast_audiohook_lock(&csth.bridge_whisper_audiohook); + ast_audiohook_write_frame(&csth.bridge_whisper_audiohook, AST_AUDIOHOOK_DIRECTION_WRITE, f); + ast_audiohook_unlock(&csth.bridge_whisper_audiohook); + } + ast_frfree(f); continue; } else if (ast_test_flag(flags, OPTION_WHISPER) && f->frametype == AST_FRAME_VOICE) { |