From aa68eac35260063d77b1401c054371271933fba8 Mon Sep 17 00:00:00 2001 From: Brian West Date: Mon, 8 Jul 2013 13:19:10 -0500 Subject: [PATCH] fix logic from race fix --- src/mod/applications/mod_fifo/mod_fifo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mod/applications/mod_fifo/mod_fifo.c b/src/mod/applications/mod_fifo/mod_fifo.c index 905c13fc8f..fa0978d647 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); }