This commit is contained in:
Anthony Minessale 2012-04-30 18:13:32 -05:00
parent b571952909
commit e71b238e9e
1 changed files with 8 additions and 6 deletions

View File

@ -660,7 +660,8 @@ static switch_status_t audio_bridge_on_exchange_media(switch_core_session_t *ses
if (!switch_channel_test_flag(channel, CF_TRANSFER) && !switch_channel_test_flag(channel, CF_REDIRECT) && if (!switch_channel_test_flag(channel, CF_TRANSFER) && !switch_channel_test_flag(channel, CF_REDIRECT) &&
!switch_channel_test_flag(channel, CF_XFER_ZOMBIE) && bd && !bd->clean_exit !switch_channel_test_flag(channel, CF_XFER_ZOMBIE) && bd && !bd->clean_exit
&& state != CS_PARK && state != CS_ROUTING && state == CS_EXCHANGE_MEDIA && !switch_channel_test_flag(channel, CF_INNER_BRIDGE)) { && state != CS_PARK && state != CS_ROUTING && state == CS_EXCHANGE_MEDIA && !switch_channel_test_flag(channel, CF_INNER_BRIDGE)) {
if (switch_channel_test_flag(channel, CF_INTERCEPT) && !switch_channel_test_flag(channel, CF_INTERCEPTED)) { if (!switch_channel_test_flag(channel, CF_INTERCEPTED)) {
if (switch_channel_test_flag(channel, CF_INTERCEPT)) {
switch_channel_hangup(channel, SWITCH_CAUSE_PICKED_OFF); switch_channel_hangup(channel, SWITCH_CAUSE_PICKED_OFF);
} else { } else {
if (!switch_channel_test_flag(channel, CF_ANSWERED)) { if (!switch_channel_test_flag(channel, CF_ANSWERED)) {
@ -671,6 +672,7 @@ static switch_status_t audio_bridge_on_exchange_media(switch_core_session_t *ses
} }
} }
} }
}
if (switch_channel_get_state(channel) == CS_EXCHANGE_MEDIA) { if (switch_channel_get_state(channel) == CS_EXCHANGE_MEDIA) {
switch_channel_set_variable(channel, "park_timeout", "3"); switch_channel_set_variable(channel, "park_timeout", "3");