[svn-commits] file: branch 1.4 r61959 - in /branches/1.4: ./ main/config.c

[svn-commits at lists.digium.com]

Author: file
Date: Wed Apr 25 20:27:18 2007
New Revision: 61959

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61959
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/main/config.c

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

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