kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 16:58:35 +00:00
Code Issues Projects Releases Wiki Activity

only clear scope vars when they were set

Browse Source
This commit is contained in:
Anthony Minessale 2011-06-18 10:28:23 -05:00
parent c35c138db5
commit d4fcba74c8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/switch_core_session.c
View File

@ -1980,7 +1980,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_exec(switch_core_session_t *
const char *app; const char *app;
switch_core_session_message_t msg = { 0 }; switch_core_session_message_t msg = { 0 };
char delim = ','; char delim = ',';
int scope = 1;
switch_assert(application_interface); switch_assert(application_interface);
app = application_interface->interface_name; app = application_interface->interface_name;
@ -2010,9 +2011,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_exec(switch_core_session_t *
free(dup); free(dup);
switch_channel_set_scope_variables(session->channel, &ovars); switch_channel_set_scope_variables(session->channel, &ovars);
scope = 1;
} }
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG, "EXECUTE %s %s(%s)\n", switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG, "EXECUTE %s %s(%s)\n",
switch_channel_get_name(session->channel), app, switch_str_nil(expanded)); switch_channel_get_name(session->channel), app, switch_str_nil(expanded));
@ -2091,7 +2093,9 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_exec(switch_core_session_t *
switch_safe_free(expanded); switch_safe_free(expanded);
} }
switch_channel_set_scope_variables(session->channel, NULL); if (scope) {
switch_channel_set_scope_variables(session->channel, NULL);
}
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }