From: Tilghman Lesher Date: Wed, 20 May 2009 23:31:17 +0000 (+0000) Subject: Merged revisions 195839 via svnmerge from X-Git-Tag: 1.6.1.3-rc1~220 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbdaeee63955effa54454778b60515771612543a;p=thirdparty%2Fasterisk.git 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@195841 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_stack.c b/apps/app_stack.c index 1b76519068..994ddbc340 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; }