From: Anthony Minessale <anthm@freeswitch.org>
Date: Fri, 17 Aug 2012 19:07:20 +0000 (-0500)
Subject: FS-4542 --resolve ok if this causes any problems it should lead us back to this commit
X-Git-Tag: v1.2.3^2~223
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c6b8edfeaa00fe31c8ecfbbc4e4d6bd125b9c3e;p=thirdparty%2Ffreeswitch.git

FS-4542 --resolve ok if this causes any problems it should lead us back to this commit
---

diff --git a/src/mod/endpoints/mod_sofia/sofia.c b/src/mod/endpoints/mod_sofia/sofia.c
index 59a2fae532..a173544031 100644
--- a/src/mod/endpoints/mod_sofia/sofia.c
+++ b/src/mod/endpoints/mod_sofia/sofia.c
@@ -6030,8 +6030,7 @@ static void sofia_handle_sip_i_state(switch_core_session_t *session, int status,
 	}
 
 	if (session) {
-		if ((switch_channel_test_flag(channel, CF_EARLY_MEDIA) || switch_channel_test_flag(channel, CF_ANSWERED)) && (status == 180 || status == 183) && !r_sdp) {
-			/* Must you send 180 after 183 w/sdp ? sheesh */
+		if (switch_channel_test_flag(channel, CF_ANSWERED) && (status == 180 || status == 183) && !r_sdp) {
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Channel %s skipping state [%s][%d]\n",
 							  switch_channel_get_name(channel), nua_callstate_name(ss_state), status);
 			goto done;
diff --git a/src/switch_channel.c b/src/switch_channel.c
index 2a3a7ad04f..38331f0be9 100644
--- a/src/switch_channel.c
+++ b/src/switch_channel.c
@@ -2953,8 +2953,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_mark_ring_ready_value(swi
 {
 	switch_event_t *event;
 
-	if (!switch_channel_test_flag(channel, CF_RING_READY) && 
-		!switch_channel_test_flag(channel, CF_EARLY_MEDIA) && !switch_channel_test_flag(channel, CF_ANSWERED)) {
+	if (!switch_channel_test_flag(channel, CF_RING_READY) && !switch_channel_test_flag(channel, CF_ANSWERED)) {
 		switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name);
 		switch_channel_set_flag_value(channel, CF_RING_READY, rv);
 		if (channel->caller_profile && channel->caller_profile->times) {