[asterisk-commits] file: trunk r61960 - in /trunk: ./ main/config.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Wed Apr 25 20:29:23 2007
New Revision: 61960

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61960
Log:
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)

........

................

Modified:
    trunk/   (props changed)
    trunk/main/config.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/config.c
URL: http://svn.digium.com/view/asterisk/trunk/main/config.c?view=diff&rev=61960&r1=61959&r2=61960
==============================================================================
--- trunk/main/config.c (original)
+++ trunk/main/config.c Wed Apr 25 20:29:23 2007
@@ -1270,6 +1270,8 @@
 
 	if (result)
 		result->include_level--;
+	else
+		cfg->include_level--;
 
 	return result;
 }