From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Tue, 13 Oct 2009 17:31:10 +0000 (+0000)
Subject: regression from yesterday causing a seg
X-Git-Tag: v1.0.6~1676
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=962f6a118bfbb37ff3eb9c2725e14561f305412e;p=thirdparty%2Ffreeswitch.git

regression from yesterday causing a seg

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15147 d0543943-73ff-0310-b7d9-9358b9ac24b2
---

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 9068156100..95ca08f691 100644
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -2026,12 +2026,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess
 					}
 				}
 
-				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;
 				}