diff options
author | Joshua Colp <jcolp@digium.com> | 2007-04-26 01:29:23 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2007-04-26 01:29:23 +0000 |
commit | 489f9c68c31f36ebf1e9119920237a1580def1b0 (patch) | |
tree | 20814edeb3fd94429c5f6f6baaa9aa4fdaf83bdb /main/config.c | |
parent | ee95074173c138b95f49e176c6c7f671032517f3 (diff) |
Merged revisions 61959 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r61959 | file | 2007-04-25 21:27:18 -0400 (Wed, 25 Apr 2007) | 10 lines
Merged revisions 61958 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r61958 | file | 2007-04-25 21:25:03 -0400 (Wed, 25 Apr 2007) | 2 lines
Don't count failed include attempts against the configuration include level. (issue #9593 reported by mostyn)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@61960 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/config.c')
-rw-r--r-- | main/config.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/main/config.c b/main/config.c index b1d30aa7c..d9d303c6c 100644 --- a/main/config.c +++ b/main/config.c @@ -1270,6 +1270,8 @@ struct ast_config *ast_config_internal_load(const char *filename, struct ast_con if (result) result->include_level--; + else + cfg->include_level--; return result; } |