FS-3413 --resolve

This commit is contained in:
Anthony Minessale committed 2011-07-12 09:41:02 -05:00
1 parent a56aa89cc5
commit 3cbae3fbd8
2 files changed
+15 -5

No files matched your search

+12 -3
View File
@@ -1701,12 +1701,23 @@ SWITCH_DECLARE(int) switch_channel_state_change_pending(switch_channel_t *channe
return channel->running_state != channel->state;
}
SWITCH_DECLARE(int) switch_channel_check_signal(switch_channel_t *channel, switch_bool_t in_thread_only)
{
if (!in_thread_only || switch_core_session_in_thread(channel->session)) {
switch_ivr_parse_all_signal_data(channel->session);
}
return 0;
}
SWITCH_DECLARE(int) switch_channel_test_ready(switch_channel_t *channel, switch_bool_t check_ready, switch_bool_t check_media)
{
int ret = 0;
switch_assert(channel != NULL);
switch_channel_check_signal(channel, SWITCH_TRUE);
if (check_media) {
ret = ((switch_channel_test_flag(channel, CF_ANSWERED) ||
switch_channel_test_flag(channel, CF_EARLY_MEDIA)) && !switch_channel_test_flag(channel, CF_PROXY_MODE) &&
@@ -1728,9 +1739,7 @@ SWITCH_DECLARE(int) switch_channel_test_ready(switch_channel_t *channel, switch_
ret++;
}
if (ret && switch_core_session_in_thread(channel->session)) {
switch_ivr_parse_all_signal_data(channel->session);
}
return ret;
}