diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-20 23:31:17 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-20 23:31:17 +0000 |
| commit | 8f96e90a2a5858515c89ddac1fd5301244ade8d4 (patch) | |
| tree | 6b8ac1ed8f6884efc20c992cb1ee28186b7df4ef | |
| parent | bfbf89adf55870dc0af872042b256aa71f3fd36d (diff) | |
Merged revisions 195839 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r195839 | tilghman | 2009-05-20 18:30:05 -0500 (Wed, 20 May 2009) | 3 lines
If a variable had a blank value upon the initial setting, then it would do nothing.
Identified by Dmitry Andrianov via private email, fixed by me.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@195841 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_stack.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/apps/app_stack.c b/apps/app_stack.c index 1b7651906..994ddbc34 100644 --- a/apps/app_stack.c +++ b/apps/app_stack.c @@ -100,21 +100,20 @@ static int frame_set_var(struct ast_channel *chan, struct gosub_stack_frame *fra } } - if (!ast_strlen_zero(value)) { - if (!found) { - variables = ast_var_assign(var, ""); - AST_LIST_INSERT_HEAD(&frame->varshead, variables, entries); - pbx_builtin_pushvar_helper(chan, var, value); - } else - pbx_builtin_setvar_helper(chan, var, value); - - manager_event(EVENT_FLAG_DIALPLAN, "VarSet", - "Channel: %s\r\n" - "Variable: LOCAL(%s)\r\n" - "Value: %s\r\n" - "Uniqueid: %s\r\n", - chan->name, var, value, chan->uniqueid); + if (!found) { + variables = ast_var_assign(var, ""); + AST_LIST_INSERT_HEAD(&frame->varshead, variables, entries); + pbx_builtin_pushvar_helper(chan, var, value); + } else { + pbx_builtin_setvar_helper(chan, var, value); } + + manager_event(EVENT_FLAG_DIALPLAN, "VarSet", + "Channel: %s\r\n" + "Variable: LOCAL(%s)\r\n" + "Value: %s\r\n" + "Uniqueid: %s\r\n", + chan->name, var, value, chan->uniqueid); return 0; } |