[asterisk-commits] file: branch 1.6.1 r173904 - in /branches/1.6.1: ./ apps/ main/

[SVN commits to the Asterisk project]

Author: file
Date: Fri Feb  6 10:01:01 2009
New Revision: 173904

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=173904
Log:
Merged revisions 173902 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r173902 | file | 2009-02-06 11:59:17 -0400 (Fri, 06 Feb 2009) | 4 lines
  
  Always detach and destroy the whisper and barge audiohooks. Additionally also allow an audiohook to be detached if it has not been attached.
  (closes issue #14414)
  Reported by: bluecrow76
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_chanspy.c
    branches/1.6.1/main/audiohook.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_chanspy.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/apps/app_chanspy.c?view=diff&rev=173904&r1=173903&r2=173904
==============================================================================
--- branches/1.6.1/apps/app_chanspy.c (original)
+++ branches/1.6.1/apps/app_chanspy.c Fri Feb  6 10:01:01 2009
@@ -495,19 +495,15 @@
 	ast_clear_flag(chan, AST_FLAG_END_DTMF_ONLY);
 	ast_channel_unlock(chan);
 
-	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.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);
 
 	ast_audiohook_lock(&csth.spy_audiohook);
 	ast_audiohook_detach(&csth.spy_audiohook);

Modified: branches/1.6.1/main/audiohook.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/main/audiohook.c?view=diff&rev=173904&r1=173903&r2=173904
==============================================================================
--- branches/1.6.1/main/audiohook.c (original)
+++ branches/1.6.1/main/audiohook.c Fri Feb  6 10:01:01 2009
@@ -354,7 +354,7 @@
  */
 int ast_audiohook_detach(struct ast_audiohook *audiohook)
 {
-	if (audiohook->status == AST_AUDIOHOOK_STATUS_DONE)
+	if (audiohook->status == AST_AUDIOHOOK_STATUS_NEW || audiohook->status == AST_AUDIOHOOK_STATUS_DONE)
 		return 0;
 
 	audiohook->status = AST_AUDIOHOOK_STATUS_SHUTDOWN;