Skip to content
Snippets Groups Projects
Commit f72e19a4 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Move reading of each dir's data_dir key into read_dir_defaults_cfg()

This appears to just be a miss from the initial commit (bd97c9d8) of the
directory default configuration (per lib) feature, so a file
lib's directory default "data dir" wouldn't be read from file.ini.

This fixes issue #602 reported by Nelgin.
parent 535d6b66
No related branches found
No related tags found
No related merge requests found
......@@ -29,6 +29,7 @@ static void read_dir_defaults_cfg(scfg_t* cfg, str_list_t ini, dir_t* dir)
{
char value[INI_MAX_VALUE_LEN];
SAFECOPY(dir->data_dir, iniGetString(ini, NULL, "data_dir", "", value));
SAFECOPY(dir->upload_sem, iniGetString(ini, NULL, "upload_sem", "", value));
SAFECOPY(dir->exts, iniGetString(ini, NULL, "extensions", "", value));
......@@ -296,7 +297,6 @@ BOOL read_file_cfg(scfg_t* cfg, char* error, size_t maxerrlen)
SAFECOPY(cfg->dir[i]->lname, iniGetString(section, NULL, "description", code, value));
SAFECOPY(cfg->dir[i]->sname, iniGetString(section, NULL, "name", code, value));
SAFECOPY(cfg->dir[i]->data_dir, iniGetString(section, NULL, "data_dir", "", value));
if(!stricmp(cfg->dir[i]->sname,"SYSOP")) /* Sysop upload directory */
cfg->sysop_dir=i;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment