Regenerate json settings on error (#79)

isivisi · Apr 21, 2024 · 75e5f70 · 75e5f70
1 parent 596104b
commit 75e5f70
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -97,6 +97,13 @@
         "stdfloat": "cpp",
         "typeindex": "cpp",
         "valarray": "cpp",
-        "variant": "cpp"
+        "variant": "cpp",
+        "__bit_reference": "cpp",
+        "__config": "cpp",
+        "__debug": "cpp",
+        "__mutex_base": "cpp",
+        "__split_buffer": "cpp",
+        "__threading_support": "cpp",
+        "__verbose_abort": "cpp"
     }
 }
diff --git a/src/settings.hpp b/src/settings.hpp
@@ -29,9 +29,15 @@ struct UserSettings {
 	std::string settingFileName;
 	json_t* settingCache = nullptr;
 
+	std::function<json_t*(json_t*)> initFunction = nullptr;
+	const std::function<json_t*(json_t*)>* migrations = nullptr;
+
 	UserSettings(std::string fn, std::function<json_t*(json_t*)> initFunction, const std::function<json_t*(json_t*)>* migrations) {
 		settingFileName = fn;
 
+		this->initFunction = initFunction;
+		this->migrations = migrations;
+
 		if (initFunction) {
 			json_t* json = readSettings();
 			UserSettings::json_create_if_not_exists(json, "settingsVersion", json_integer(settingsVersion));
@@ -159,13 +165,19 @@ struct UserSettings {
 			if (!file) {
 				return json_object();
 			}
-
+				
 			json_error_t error;
 			json_t *rootJ = json_loadf(file, 0, &error);
-
+				
 			fclose(file);
+
+			if (!rootJ) {
+				return json_object();
+			}
+
 			settingCache = rootJ;
 			return rootJ;
+
 		} else return settingCache;
 	}