From: Brian West <brian@freeswitch.org>
Date: Mon, 8 Jul 2013 18:19:10 +0000 (-0500)
Subject: fix logic from race fix
X-Git-Tag: v1.5.3~72
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=35fca3d29080ea9937d170c687953e91c98bc41a;p=thirdparty%2Ffreeswitch.git

fix logic from race fix
---

diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c
index 0da3c398ff..cd1420c058 100644
--- a/src/mod/applications/mod_fifo/mod_fifo.c
+++ b/src/mod/applications/mod_fifo/mod_fifo.c
@@ -3094,12 +3094,12 @@ SWITCH_STANDARD_APP(fifo_function)
 
 				switch_ivr_multi_threaded_bridge(session, other_session, on_dtmf, other_session, session);
 
-				if (switch_channel_test_flag(other_channel, CF_TRANSFER) || switch_channel_up(other_channel)) {
+				if (switch_channel_test_flag(other_channel, CF_TRANSFER) && switch_channel_up(other_channel)) {
 					switch_channel_set_variable(switch_core_session_get_channel(other_session), "fifo_initiated_bridge", NULL);
 					switch_channel_set_variable(switch_core_session_get_channel(other_session), "fifo_bridge_role", NULL);
 				}
 				
-				if (switch_channel_test_flag(channel, CF_TRANSFER) || switch_channel_up(channel)) {
+				if (switch_channel_test_flag(channel, CF_TRANSFER) && switch_channel_up(channel)) {
 					switch_channel_set_variable(switch_core_session_get_channel(other_session), "fifo_initiated_bridge", NULL);
 					switch_channel_set_variable(switch_core_session_get_channel(other_session), "fifo_bridge_role", NULL);
 				}