From 1f5b84aa7717e6e6afc88f094efe1cb470cf9b42 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 25 Sep 2008 14:25:59 +0000 Subject: [PATCH] increment app before execute in case it returns to execute it will go to the next item in the list and not the same git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9645 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_core_state_machine.c | 13 ++++++++----- src/switch_ivr_bridge.c | 4 +++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/switch_core_state_machine.c b/src/switch_core_state_machine.c index 7c05cc2671..ea6af4bde7 100644 --- a/src/switch_core_state_machine.c +++ b/src/switch_core_state_machine.c @@ -137,20 +137,23 @@ static void switch_core_standard_on_execute(switch_core_session_t *session) } while (switch_channel_get_state(session->channel) == CS_EXECUTE && extension->current_application) { + switch_caller_application_t *current_application = extension->current_application; + + extension->current_application = extension->current_application->next; + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Execute %s(%s)\n", switch_channel_get_name(session->channel), - extension->current_application->application_name, switch_str_nil(extension->current_application->application_data)); + current_application->application_name, switch_str_nil(current_application->application_data)); if (switch_core_session_execute_application(session, - extension->current_application->application_name, - extension->current_application->application_data) != SWITCH_STATUS_SUCCESS) { + current_application->application_name, + current_application->application_data) != SWITCH_STATUS_SUCCESS) { return; } if (switch_channel_test_flag(session->channel, CF_RESET)) { goto top; } - - extension->current_application = extension->current_application->next; + } if (switch_channel_get_state(session->channel) == CS_EXECUTE) { diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c index b97cf750e7..840b276f4e 100644 --- a/src/switch_ivr_bridge.c +++ b/src/switch_ivr_bridge.c @@ -136,7 +136,9 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj) switch_channel_wait_for_flag(chan_b, CF_BRIDGED, SWITCH_TRUE, 10000, chan_a); if (!switch_channel_test_flag(chan_b, CF_BRIDGED)) { - switch_channel_hangup(chan_b, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + if (!(switch_channel_test_flag(chan_b, CF_TRANSFER) || switch_channel_get_state(chan_b) == CS_RESET)) { + switch_channel_hangup(chan_b, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + } goto end_of_bridge_loop; }