FS-3097 regression from 4f93ea25ece53df029e6dc6c913ad7c190df22d5

diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index c0bef4be597045ae04424ce549ad1cb53ae69a86..25273bafc4991a7b04aaa96df7fb6c9a3c97d5a1 100644 (file)
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -79,6 +79,7 @@ SWITCH_DECLARE(int) switch_channel_test_ready(switch_channel_t *channel, switch_
 
 #define switch_channel_ready(_channel) switch_channel_test_ready(_channel, SWITCH_TRUE, SWITCH_FALSE)
 #define switch_channel_media_ready(_channel) switch_channel_test_ready(_channel, SWITCH_TRUE, SWITCH_TRUE)
+#define switch_channel_media_up(_channel) (switch_channel_test_flag(_channel, CF_ANSWERED) || switch_channel_test_flag(_channel, CF_EARLY_MEDIA))
 
 #define switch_channel_up(_channel) (switch_channel_get_state(_channel) < CS_HANGUP)
 #define switch_channel_down(_channel) (switch_channel_get_state(_channel) >= CS_HANGUP)

diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index f130625a75bd3adaf8395a6c9dd07fb3eb9467c4..88c72bf1b89e88603d90698a51245cafe5230f8e 100644 (file)
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -1398,10 +1398,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uu
                                return SWITCH_STATUS_FALSE;
                        }
 
-                       //if (!switch_channel_test_flag(originator_channel, CF_ANSWERED)) {
-                       if (!switch_channel_media_ready(originator_channel)) {
-                               if (switch_channel_media_ready(originatee_channel)) {
-                               //if (switch_channel_test_flag(originatee_channel, CF_ANSWERED)) {
+                       if (!switch_channel_media_up(originator_channel)) {
+                               if (switch_channel_media_up(originatee_channel)) {
                                        swap_session = originator_session;
                                        originator_session = originatee_session;
                                        originatee_session = swap_session;