From: Joshua Colp <jcolp@digium.com>
Date: Thu, 26 Apr 2007 01:29:23 +0000 (+0000)
Subject: Merged revisions 61959 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2806
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=489f9c68c31f36ebf1e9119920237a1580def1b0;p=thirdparty%2Fasterisk.git

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
---

diff --git a/main/config.c b/main/config.c
index b1d30aa7c4..d9d303c6c6 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;
 }