[Freeswitch-svn] [commit] r5836 - freeswitch/trunk/src

[Freeswitch SVN]

Author: anthm
Date: Wed Oct 10 13:41:08 2007
New Revision: 5836

Modified:
   freeswitch/trunk/src/switch_ivr_bridge.c

Log:
only honor hangup_after_bridge=true if the channel is answered

Modified: freeswitch/trunk/src/switch_ivr_bridge.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_bridge.c	(original)
+++ freeswitch/trunk/src/switch_ivr_bridge.c	Wed Oct 10 13:41:08 2007
@@ -458,7 +458,7 @@
 		switch_channel_set_variable(channel, SWITCH_BRIDGE_VARIABLE, NULL);
 		switch_channel_set_variable(other_channel, SWITCH_BRIDGE_VARIABLE, NULL);
 
-		if (switch_channel_get_state(other_channel) < CS_HANGUP
+		if (switch_channel_test_flag(other_channel, CF_ANSWERED) && switch_channel_get_state(other_channel) < CS_HANGUP
 			&& switch_true(switch_channel_get_variable(other_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) {
 			switch_channel_hangup(other_channel, switch_channel_get_cause(channel));
 		} else {
@@ -671,7 +671,7 @@
 
   done:
 
-	if (switch_channel_get_state(caller_channel) < CS_HANGUP && 
+	if (switch_channel_test_flag(caller_channel, CF_ANSWERED) && switch_channel_get_state(caller_channel) < CS_HANGUP && 
 		switch_true(switch_channel_get_variable(caller_channel, SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE))) {
 		switch_channel_hangup(caller_channel, switch_channel_get_cause(peer_channel));
 	}