fix: loadSettings crash when no data.json /loadData exists/is empty

Mara-Li · Dec 17, 2023 · dca1a0a · dca1a0a
1 parent 0f94a81
commit dca1a0a
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main.ts b/src/main.ts
@@ -269,8 +269,13 @@ export default class NoteInFolder extends Plugin {
 
 	async loadSettings() {
 		const loadData = await this.loadData();
-		this.settings = merge(DEFAULT_SETTINGS, loadData) as unknown as NoteInFolderSettings;
-		this.settings = this.mergeFolderSettings();
+		try {
+			this.settings = merge(DEFAULT_SETTINGS, loadData) as unknown as NoteInFolderSettings;
+			this.settings = this.mergeFolderSettings();
+		} catch (e) {
+			console.warn("Error while merging folder settings ; use default merge");
+			this.settings = Object.assign({}, DEFAULT_SETTINGS, await this.loadData());
+		}
 	}
 
 	async saveSettings() {