]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
fix logic from race fix
authorBrian West <brian@freeswitch.org>
Mon, 8 Jul 2013 18:19:10 +0000 (13:19 -0500)
committerBrian West <brian@freeswitch.org>
Mon, 8 Jul 2013 18:19:22 +0000 (13:19 -0500)
src/mod/applications/mod_fifo/mod_fifo.c

index 0da3c398ffea60d5ac6eecb7b20ba29999860c34..cd1420c058dc1bd382aea13e404a40a83033de82 100644 (file)
@@ -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);
                                }