From: Michael Jerris <mike@jerris.com>
Date: Wed, 21 Jan 2015 22:16:56 +0000 (-0500)
Subject: FS-7174: #resolve #comment make sure not to leave any sessions readlocked in bridge_e... 
X-Git-Tag: v1.4.16~1^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=062ddcfa6f61b7cf62119f76c4c827f4e1569910;p=thirdparty%2Ffreeswitch.git

FS-7174: #resolve #comment make sure not to leave any sessions readlocked in bridge_early_media=true in case one in the middle of the list is abandoned
---

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index 00eebd1cc1..506fc53bfd 100644
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -1753,11 +1753,7 @@ static void *SWITCH_THREAD_FUNC early_thread_run(switch_thread_t *thread, void *
 			switch_core_session_t *session = originate_status[i].peer_session;
 			switch_channel_t *channel = originate_status[i].peer_channel;
 
-			if (!session) {
-				break;
-			}
-			
-			if (!channel || !switch_channel_up(channel)) {
+			if (!session || !channel || !switch_channel_up(channel)) {
 				continue;
 			}
 			
@@ -1836,7 +1832,7 @@ static void *SWITCH_THREAD_FUNC early_thread_run(switch_thread_t *thread, void *
 		switch_core_session_t *session = originate_status[i].peer_session;
 		switch_channel_t *channel = originate_status[i].peer_channel;
 		
-		if (!session) break;
+		if (!session) continue;
 
 		if (switch_core_codec_ready((&read_codecs[i]))) {
 			switch_core_codec_destroy(&read_codecs[i]);