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

Don't try to load node.ini if no nodes are configured in main.ini

But set the error string to hopefully be printed as a warning
parent f05b1f5c
No related branches found
No related tags found
No related merge requests found
......@@ -85,10 +85,14 @@ bool load_cfg(scfg_t* cfg, char* text[], bool prep, bool req_cfg, char* error, s
for (i = 0; i < cfg->sys_nodes; i++)
prep_dir(cfg->ctrl_dir, cfg->node_path[i], sizeof(cfg->node_path[i]));
SAFECOPY(cfg->node_dir, cfg->node_path[cfg->node_num - 1]);
prep_dir(cfg->ctrl_dir, cfg->node_dir, sizeof(cfg->node_dir));
if (read_node_cfg(cfg, error, maxerrlen) == false && req_cfg)
return false;
if (cfg->sys_nodes < 1)
snprintf(error, maxerrlen, "%d nodes configured in %s", cfg->sys_nodes, cfg->filename);
else {
SAFECOPY(cfg->node_dir, cfg->node_path[cfg->node_num - 1]);
prep_dir(cfg->ctrl_dir, cfg->node_dir, sizeof(cfg->node_dir));
if (read_node_cfg(cfg, error, maxerrlen) == false && req_cfg)
return false;
}
if (read_msgs_cfg(cfg, error, maxerrlen) == false)
return false;
if (read_file_cfg(cfg, error, maxerrlen) == false)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment