Merge remote-tracking branch 'upstream/main'

Zettelkasten-Team · May 15, 2024 · ef1c542 · ef1c542
2 parents 1610a80 + d1e250d
commit ef1c542
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 361 deletions.
diff --git a/src/main/java/de/danielluedecke/zettelkasten/ZettelkastenApp.java b/src/main/java/de/danielluedecke/zettelkasten/ZettelkastenApp.java
@@ -222,7 +222,8 @@ void logStartingMainWindow() {
     void validateSettings() {
         //TODO use default settings
         if (settings == null) {
-            throw new IllegalArgumentException("Settings cannot be null.");
+            Settings settings = new Settings();
+            settings.initDefaultSettingsIfMissing();
         }
     }
 

diff --git a/src/test/java/de/danielluedecke/zettelkasten/ZettelkastenAppNGTest.java b/src/test/java/de/danielluedecke/zettelkasten/ZettelkastenAppNGTest.java
diff --git a/src/test/java/de/danielluedecke/zettelkasten/tasks/AutoBackupTaskNGTest.java b/src/test/java/de/danielluedecke/zettelkasten/tasks/AutoBackupTaskNGTest.java