[asterisk-commits] oej: trunk r63255 - in /trunk: ./ main/config.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon May  7 15:07:38 2007
New Revision: 63255

URL: http://svn.digium.com/view/asterisk?view=rev&rev=63255
Log:
Merged revisions 63254 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r63254 | oej | 2007-05-07 22:05:15 +0200 (Mon, 07 May 2007) | 2 lines

Don't remove configuration from memory just because one section failed.

........

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=63255&r1=63254&r2=63255
==============================================================================
--- trunk/main/config.c (original)
+++ trunk/main/config.c Mon May  7 15:07:38 2007
@@ -631,7 +631,6 @@
 				} else if (!strcasecmp(cur, "+")) {
 					*cat = category_get(cfg, catname, 1);
 					if (!(*cat)) {
-						ast_config_destroy(cfg);
 						if (newcat)
 							ast_category_destroy(newcat);
 						ast_log(LOG_WARNING, "Category addition requested, but category '%s' does not exist, line %d of %s\n", catname, lineno, configfile);