[Freeswitch-trunk] [commit] r12585 - freeswitch/trunk/src

[FreeSWITCH SVN]

Author: anthm
Date: Thu Mar 12 11:47:47 2009
New Revision: 12585

Log:
FSCORE-331

Modified:
   freeswitch/trunk/src/switch_core_session.c
   freeswitch/trunk/src/switch_ivr_originate.c

Modified: freeswitch/trunk/src/switch_core_session.c
==============================================================================
--- freeswitch/trunk/src/switch_core_session.c	(original)
+++ freeswitch/trunk/src/switch_core_session.c	Thu Mar 12 11:47:47 2009
@@ -463,7 +463,7 @@
 				}
 			}
 
-			if (peer_profile) {
+			if (peer_profile && !(flags & SOF_FORKED_DIAL)) {
 				if ((cloned_profile = switch_caller_profile_clone(session, peer_profile)) != 0) {
 					switch_channel_set_originatee_caller_profile(channel, cloned_profile);
 				}

Modified: freeswitch/trunk/src/switch_ivr_originate.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_originate.c	(original)
+++ freeswitch/trunk/src/switch_ivr_originate.c	Thu Mar 12 11:47:47 2009
@@ -2118,6 +2118,16 @@
 	}
 
 	if (*bleg) {
+		if (caller_channel && !switch_channel_get_originatee_caller_profile(caller_channel)) {
+			switch_caller_profile_t *cloned_profile, *peer_profile = switch_channel_get_caller_profile(switch_core_session_get_channel(*bleg));
+			
+			if (peer_profile) {
+				if ((cloned_profile = switch_caller_profile_clone(*bleg, peer_profile)) != 0) {
+					switch_channel_set_originatee_caller_profile(caller_channel, cloned_profile);
+				}
+			}
+		}
+
 		switch_ivr_sleep(*bleg, 0, SWITCH_TRUE, NULL);
 	}