[asterisk-commits] twilson: branch 1.6.1 r158377 - in /branches/1.6.1: ./ cdr/cdr_csv.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Fri Nov 21 11:17:23 2008
New Revision: 158377

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

........
  r158374 | twilson | 2008-11-21 11:08:16 -0600 (Fri, 21 Nov 2008) | 8 lines
  
  Reloading the config and having no changes still initialized some settings to 0. Initialize settings after doing all of the cfg checks.
  
  (closes issue #13942)
  Reported by: davidw
  Patches: 
        cdr_diff.txt uploaded by otherwiseguy (license 396)
  Tested by: davidw
........

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

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

Modified: branches/1.6.1/cdr/cdr_csv.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/cdr/cdr_csv.c?view=diff&rev=158377&r1=158376&r2=158377
==============================================================================
--- branches/1.6.1/cdr/cdr_csv.c (original)
+++ branches/1.6.1/cdr/cdr_csv.c Fri Nov 21 11:17:23 2008
@@ -96,15 +96,15 @@
 	const char *tmp;
 	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
 
+	if (!(cfg = ast_config_load(config, config_flags))) {
+		ast_log(LOG_WARNING, "unable to load config: %s\n", config);
+		return 0;
+	} else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
+		return 1;
+
 	usegmtime = 0;
 	loguniqueid = 0;
 	loguserfield = 0;
-
-	if (!(cfg = ast_config_load(config, config_flags))) {
-		ast_log(LOG_WARNING, "unable to load config: %s\n", config);
-		return 0;
-	} else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
-		return 1;
 
 	if (!(var = ast_variable_browse(cfg, "csv"))) {
 		ast_config_destroy(cfg);