From 875aee4c09a1780ac57b38fbb74a7bec2503fba0 Mon Sep 17 00:00:00 2001 From: Richard Mudgett Date: Tue, 14 Jul 2015 16:55:46 -0500 Subject: pbx.c: Post AMI VarSet event if delete a non-empty dialplan variable. ASTERISK-25256 #close Reported by: Richard Mudgett Change-Id: I0b6be720b66fa956f6a798cd22ef8934eb0c0ff3 --- main/pbx.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/main/pbx.c b/main/pbx.c index 8f5ee646c..f23dff7d2 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -11591,6 +11591,8 @@ int pbx_builtin_setvar_helper(struct ast_channel *chan, const char *name, const struct ast_var_t *newvariable; struct varshead *headp; const char *nametail = name; + /*! True if the old value was not an empty string. */ + int old_value_existed = 0; if (name[strlen(name) - 1] == ')') { char *function = ast_strdupa(name); @@ -11617,6 +11619,7 @@ int pbx_builtin_setvar_helper(struct ast_channel *chan, const char *name, const if (strcmp(ast_var_name(newvariable), nametail) == 0) { /* there is already such a variable, delete it */ AST_LIST_REMOVE_CURRENT(entries); + old_value_existed = !ast_strlen_zero(ast_var_value(newvariable)); ast_var_delete(newvariable); break; } @@ -11629,6 +11632,9 @@ int pbx_builtin_setvar_helper(struct ast_channel *chan, const char *name, const } AST_LIST_INSERT_HEAD(headp, newvariable, entries); ast_channel_publish_varset(chan, name, value); + } else if (old_value_existed) { + /* We just deleted a non-empty dialplan variable. */ + ast_channel_publish_varset(chan, name, ""); } if (chan) -- cgit v1.2.3