From: Terry Wilson <twilson@digium.com>
Date: Fri, 21 Nov 2008 17:08:16 +0000 (+0000)
Subject: Reloading the config and having no changes still initialized some settings to 0.... 
X-Git-Tag: 1.6.2.0-beta1~804
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a4177f52ee705a59d8ab18ad62097f9ea058429;p=thirdparty%2Fasterisk.git

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158374 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c
index daad888717..0654bab592 100644
--- a/cdr/cdr_csv.c
+++ b/cdr/cdr_csv.c
@@ -96,16 +96,16 @@ static int load_config(int reload)
 	const char *tmp;
 	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
 
-	usegmtime = 0;
-	loguniqueid = 0;
-	loguserfield = 0;
-
 	if (!(cfg = ast_config_load(config, config_flags)) || cfg == CONFIG_STATUS_FILEINVALID) {
 		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 (!(var = ast_variable_browse(cfg, "csv"))) {
 		ast_config_destroy(cfg);
 		return 0;