paul
/
monocoque
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some issues with config loading

This commit is contained in:
Paul Dino Jones 2024-09-04 16:15:34 -04:00
parent f474027f0a
commit 1ffbd84721
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/monocoque/helper/confighelper.c
View File

@ -198,6 +198,7 @@ int getconfigtouse(const char* config_file_str, char* car, int sim)
return 0; return 0;
} }
int confignum = 0; int confignum = 0;
slogt("Multiple configs found");
for (j = 0; j < configs; j++) for (j = 0; j < configs; j++)
{ {
config_config = config_setting_get_elem(config, j); config_config = config_setting_get_elem(config, j);
@ -207,19 +208,21 @@ int getconfigtouse(const char* config_file_str, char* car, int sim)
config_setting_lookup_int(config_config, "sim", &csim); config_setting_lookup_int(config_config, "sim", &csim);
if (csim != sim && csim != 0) if (csim != sim && csim != 0)
{ {
slogt("rejected config %i", j);
continue; continue;
} }
found = config_setting_lookup_string(config_config, "car", &temp);
if(strcicmp("default", car) == 0)
{
confignum = j;
}
if(strcicmp(temp, car) != 0)
{
continue;
}
confignum = j;
slogt("checking if car is matched %i", j);
found = config_setting_lookup_string(config_config, "car", &temp);
if(strcicmp(temp, car) == 0)
{
confignum = j;
}
if(strcicmp("default", temp) == 0)
{
slogt("matched default car");
confignum = j;
}
break; break;
} }
return confignum; return confignum;