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

[FreeSWITCH SVN]

Author: anthm
Date: Tue Nov 11 09:26:21 2008
New Revision: 10328

Log:
allow calls to be stolen from originate

Modified:
   freeswitch/trunk/src/switch_ivr_originate.c

Modified: freeswitch/trunk/src/switch_ivr_originate.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_originate.c	(original)
+++ freeswitch/trunk/src/switch_ivr_originate.c	Tue Nov 11 09:26:21 2008
@@ -1638,16 +1638,21 @@
 			}
 
 			for (i = 0; i < and_argc; i++) {
+				switch_channel_state_t state;
+
 				if (!peer_channels[i]) {
 					continue;
 				}
+				
 				switch_channel_clear_flag(peer_channels[i], CF_ORIGINATING);
 				if (status == SWITCH_STATUS_SUCCESS) { 
 					if (bleg && *bleg && *bleg == peer_sessions[i]) {
 						continue;
 					}
-				} else if (switch_channel_get_state(switch_core_session_get_channel(peer_sessions[i])) < CS_HANGUP) {
-					switch_channel_hangup(switch_core_session_get_channel(peer_sessions[i]), *cause);
+				} else if ((state=switch_channel_get_state(peer_channels[i])) < CS_HANGUP) {
+					if (!(state == CS_RESET || switch_channel_test_flag(peer_channels[i], CF_TRANSFER))) {
+						switch_channel_hangup(peer_channels[i], *cause);
+					}
 				}
 
 				switch_core_session_rwunlock(peer_sessions[i]);