diff options
| author | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-21 17:12:27 +0000 |
|---|---|---|
| committer | twilson <twilson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-21 17:12:27 +0000 |
| commit | 7e14656850e81d98f14e50374dfb76f6e52983dc (patch) | |
| tree | 9df779f29c51c62afa4b3afb524ed88cf16881b0 | |
| parent | 51ddbf24663eb60973f72557290f620b1f81176d (diff) | |
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
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@158376 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | cdr/cdr_csv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cdr/cdr_csv.c b/cdr/cdr_csv.c index 236292d4c..1bfdfa610 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))) { 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; |