From: Anthony Minessale <anthm@freeswitch.org>
Date: Wed, 26 Sep 2012 16:25:42 +0000 (-0500)
Subject: FS-4636 fix regression
X-Git-Tag: v1.3.0~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=155ecd96506f8d6d33da45ced1ed8856aa50ec29;p=thirdparty%2Ffreeswitch.git

FS-4636 fix regression
---

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 7cb296b1c6..0efa8e238e 100644
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -1224,7 +1224,11 @@ static switch_status_t setup_ringback(originate_global_t *oglobals, originate_st
 				switch_goto_status(SWITCH_STATUS_GENERR, end);
 			}
 
-			switch_core_session_get_read_impl(originate_status[0].peer_session, &peer_read_impl);
+			if (oglobals->bridge_early_media > -1 && zstr(ringback_data) && len == 1 && originate_status[0].peer_session) {
+				switch_core_session_get_read_impl(originate_status[0].peer_session, &peer_read_impl);
+			} else {
+				switch_core_session_get_read_impl(oglobals->session, &peer_read_impl);
+			}
 
 			if (switch_core_codec_init(write_codec,
 									   "L16",