<h1>Project "FreeSWITCH Source" received a push.</h1>

<h2>branch: master updated</h2>
<pre>
       via: 155aafd3f4942a8cf42c3dedf5421645d051d7dd (commit)
      from: cb6f1ed61da20672600db792d3a86e051fa484c5 (commit)


</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Anthony Minessale
comments: 
FS-3097 regression from 4f93ea25ece53df029e6dc6c913ad7c190df22d5

<span style="color: #000080; font-weight: bold">diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h</span>
<span style="color: #000080; font-weight: bold">index c0bef4b..25273ba 100644</span>
<span style="color: #A00000">--- a/src/include/switch_channel.h</span>
<span style="color: #00A000">+++ b/src/include/switch_channel.h</span>
<span style="color: #800080; font-weight: bold">@@ -79,6 +79,7 @@ SWITCH_DECLARE(int) switch_channel_test_ready(switch_channel_t *channel, switch_</span>
 
 #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)
<span style="color: #00A000">+#define switch_channel_media_up(_channel) (switch_channel_test_flag(_channel, CF_ANSWERED) || switch_channel_test_flag(_channel, CF_EARLY_MEDIA))</span>
 
 #define switch_channel_up(_channel) (switch_channel_get_state(_channel) &lt; CS_HANGUP)
 #define switch_channel_down(_channel) (switch_channel_get_state(_channel) &gt;= CS_HANGUP)
<span style="color: #000080; font-weight: bold">diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c</span>
<span style="color: #000080; font-weight: bold">index f130625..88c72bf 100644</span>
<span style="color: #A00000">--- a/src/switch_ivr_bridge.c</span>
<span style="color: #00A000">+++ b/src/switch_ivr_bridge.c</span>
<span style="color: #800080; font-weight: bold">@@ -1398,10 +1398,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uu</span>
                                 return SWITCH_STATUS_FALSE;
                         }
 
<span style="color: #A00000">-                        //if (!switch_channel_test_flag(originator_channel, CF_ANSWERED)) {</span>
<span style="color: #A00000">-                        if (!switch_channel_media_ready(originator_channel)) {</span>
<span style="color: #A00000">-                                if (switch_channel_media_ready(originatee_channel)) {</span>
<span style="color: #A00000">-                                //if (switch_channel_test_flag(originatee_channel, CF_ANSWERED)) {</span>
<span style="color: #00A000">+                        if (!switch_channel_media_up(originator_channel)) {</span>
<span style="color: #00A000">+                                if (switch_channel_media_up(originatee_channel)) {</span>
                                         swap_session = originator_session;
                                         originator_session = originatee_session;
                                         originatee_session = swap_session;
</pre></div>
========================================================================<pre>

Summary of changes:
 src/include/switch_channel.h |    1 +
 src/switch_ivr_bridge.c      |    6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH Source</p>