Revision
15147
Author
anthm
Date
2009-10-13 12:31:10 -0500 (Tue, 13 Oct 2009)

Log Message

regression from yesterday causing a seg

Modified Paths

Diff

Modified: freeswitch/trunk/src/switch_ivr_originate.c (15146 => 15147)


--- freeswitch/trunk/src/switch_ivr_originate.c	2009-10-13 00:23:35 UTC (rev 15146)
+++ freeswitch/trunk/src/switch_ivr_originate.c	2009-10-13 17:31:10 UTC (rev 15147)
@@ -2026,12 +2026,8 @@
 					}
 				}
 
-				if (originate_status[0].peer_session
-					&& switch_core_session_dequeue_message(oglobals.session, &message) == SWITCH_STATUS_SUCCESS) {
-					if (oglobals.session && !ringback_data && or_argc == 1 && and_argc == 1) {	
-						/* when there is only 1 channel to call and bridge and no ringback */
-						switch_core_session_receive_message(oglobals.session, message);
-					}
+				if (oglobals.session && switch_core_session_dequeue_message(oglobals.session, &message) == SWITCH_STATUS_SUCCESS) {
+					switch_core_session_receive_message(oglobals.session, message);
 					message = NULL;
 				}