mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-29 23:39:35 +00:00
Merged revisions 163912 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r163912 | file | 2008-12-12 20:59:24 -0400 (Fri, 12 Dec 2008) | 2 lines Only detach and destroy the whisper audiohooks if they are actually in use. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@163914 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -495,14 +495,19 @@ static int channel_spy(struct ast_channel *chan, struct chanspy_ds *spyee_chansp
|
||||
ast_clear_flag(chan, AST_FLAG_END_DTMF_ONLY);
|
||||
ast_channel_unlock(chan);
|
||||
|
||||
ast_audiohook_lock(&csth.whisper_audiohook);
|
||||
ast_audiohook_detach(&csth.whisper_audiohook);
|
||||
ast_audiohook_unlock(&csth.whisper_audiohook);
|
||||
ast_audiohook_destroy(&csth.whisper_audiohook);
|
||||
ast_audiohook_lock(&csth.bridge_whisper_audiohook);
|
||||
ast_audiohook_detach(&csth.bridge_whisper_audiohook);
|
||||
ast_audiohook_unlock(&csth.bridge_whisper_audiohook);
|
||||
ast_audiohook_destroy(&csth.bridge_whisper_audiohook);
|
||||
if (ast_test_flag(flags, OPTION_WHISPER)) {
|
||||
ast_audiohook_lock(&csth.whisper_audiohook);
|
||||
ast_audiohook_detach(&csth.whisper_audiohook);
|
||||
ast_audiohook_unlock(&csth.whisper_audiohook);
|
||||
ast_audiohook_destroy(&csth.whisper_audiohook);
|
||||
}
|
||||
|
||||
if (ast_test_flag(flags, OPTION_BARGE)) {
|
||||
ast_audiohook_lock(&csth.bridge_whisper_audiohook);
|
||||
ast_audiohook_detach(&csth.bridge_whisper_audiohook);
|
||||
ast_audiohook_unlock(&csth.bridge_whisper_audiohook);
|
||||
ast_audiohook_destroy(&csth.bridge_whisper_audiohook);
|
||||
}
|
||||
|
||||
ast_audiohook_lock(&csth.spy_audiohook);
|
||||
ast_audiohook_detach(&csth.spy_audiohook);
|
||||
|
||||
Reference in New Issue
Block a user