kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 02:18:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 158374 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@158376 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Terry Wilson
2008-11-21 17:12:27 +00:00
parent 44203a91d2
commit ae40f9a6c9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cdr/cdr_csv.c
View File

@@ -96,16 +96,16 @@ static int load_config(int reload)
const char *tmp; const char *tmp;
struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
usegmtime = 0;
loguniqueid = 0;
loguserfield = 0;
if (!(cfg = ast_config_load(config, config_flags))) { if (!(cfg = ast_config_load(config, config_flags))) {
ast_log(LOG_WARNING, "unable to load config: %s\n", config); ast_log(LOG_WARNING, "unable to load config: %s\n", config);
return 0; return 0;
} else if (cfg == CONFIG_STATUS_FILEUNCHANGED) } else if (cfg == CONFIG_STATUS_FILEUNCHANGED)
return 1; return 1;
usegmtime = 0;
loguniqueid = 0;
loguserfield = 0;
if (!(var = ast_variable_browse(cfg, "csv"))) { if (!(var = ast_variable_browse(cfg, "csv"))) {
ast_config_destroy(cfg); ast_config_destroy(cfg);
return 0; return 0;