[svn-commits] tilghman: branch 1.6.0 r116636 - in /branches/1.6.0: ./ cdr/cdr_csv.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu May 15 12:59:17 2008
New Revision: 116636

URL: http://svn.digium.com/view/asterisk?view=rev&rev=116636
Log:
Merged revisions 116631 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r116631 | tilghman | 2008-05-15 12:58:22 -0500 (Thu, 15 May 2008) | 3 lines

Don't unload config on reload, when config has not changed.
(Closes issue #12652)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/cdr/cdr_csv.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/cdr/cdr_csv.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/cdr/cdr_csv.c?view=diff&rev=116636&r1=116635&r2=116636
==============================================================================
--- branches/1.6.0/cdr/cdr_csv.c (original)
+++ branches/1.6.0/cdr/cdr_csv.c Thu May 15 12:59:17 2008
@@ -104,7 +104,7 @@
 		ast_log(LOG_WARNING, "unable to load config: %s\n", config);
 		return 0;
 	} else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
-		return 0;
+		return 1;
 
 	if (!(var = ast_variable_browse(cfg, "csv"))) {
 		ast_config_destroy(cfg);