diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-05 21:39:24 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-06-05 21:39:24 +0000 |
| commit | 17611f9c52cb1f4952f8672addd0d553c6a074b2 (patch) | |
| tree | 95c7600961382c91e4f77666827444f0c0bf7219 /main | |
| parent | 7f88025b20ffcde5522f7ff7b2d74740db64056a (diff) | |
Merged revisions 120828 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r120828 | murf | 2008-06-05 15:34:42 -0600 (Thu, 05 Jun 2008) | 1 line
a small fix for a crash that occurs when compiling AEL with global vars
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@120829 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index 6566e20e1..e0608ae30 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -7593,7 +7593,7 @@ int pbx_builtin_setvar_multiple(struct ast_channel *chan, void *vdata) pbx_builtin_setvar_helper(chan, pair.name, pair.value); if (strchr(pair.name, ' ')) ast_log(LOG_WARNING, "Please avoid unnecessary spaces on variables as it may lead to unexpected results ('%s' set to '%s').\n", pair.name, pair.value); - } else if (chan) { + } else if (!chan) { ast_log(LOG_WARNING, "MSet: ignoring entry '%s' with no '='\n", pair.name); } else { ast_log(LOG_WARNING, "MSet: ignoring entry '%s' with no '=' (in %s@%s:%d\n", pair.name, chan->exten, chan->context, chan->priority); |