fixes crash on apconfig

This commit is contained in:
Nic Limper
2023-05-26 01:58:43 +02:00
parent 2bdb82d146
commit cd288e79f4
2 changed files with 8 additions and 7 deletions

View File

@@ -357,7 +357,7 @@
{
"key": "bytes",
"name": "bytes",
"desc": "70 bytes, formatted as 0x00,0x00,...",
"desc": "76 bytes, formatted as 0x00,0x00,...",
"type": "text"
}
]

View File

@@ -248,15 +248,16 @@ void initAPconfig() {
LittleFS.begin(true);
DynamicJsonDocument APconfig(150);
File configFile = LittleFS.open("/current/apconfig.json", "r");
DeserializationError error = deserializeJson(APconfig, configFile);
if (error) {
if (configFile) {
DeserializationError error = deserializeJson(APconfig, configFile);
if (error) {
configFile.close();
Serial.println("failed to read apconfig.json. Using default config");
}
configFile.close();
Serial.println("failed to read apconfig.json. Using default config");
}
configFile.close();
config.channel = APconfig["channel"] | 25;
strlcpy(config.alias, APconfig["alias"], sizeof(config.alias));
if (APconfig["alias"]) strlcpy(config.alias, APconfig["alias"], sizeof(config.alias));
config.led = APconfig["led"] | 255;
config.language = APconfig["language"] | getDefaultLanguage();
config.maxsleep = APconfig["maxsleep"] | 10;