fix(#2): fixed a bug with theme loading

celedev97 · Nov 22, 2023 · 4c72eac · 4c72eac
1 parent 66b1f42
commit 4c72eac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/dev/cele/asa_sm/dto/SettingsDto.java b/src/main/java/dev/cele/asa_sm/dto/SettingsDto.java
@@ -6,5 +6,5 @@
 @Data
 @NoArgsConstructor
 public class SettingsDto {
-    private String theme = "/dev/cele/asa_sm/themes/nord.theme.json";
+    private String theme = "classpath:/dev/cele/asa_sm/themes/nord.theme.json";
 }
diff --git a/src/main/java/dev/cele/asa_sm/services/SettingsService.java b/src/main/java/dev/cele/asa_sm/services/SettingsService.java
@@ -59,7 +59,13 @@ public void loadTheme(){
             IntelliJTheme.setup(AsaSmApplication.class.getResourceAsStream(themePath));
         }else{
             //load theme from file
-            IntelliJTheme.setup(new FileInputStream(Const.THEME_DIR.resolve(settings.getTheme()).toFile()));
+            try {
+                IntelliJTheme.setup(new FileInputStream(Const.THEME_DIR.resolve(settings.getTheme()).toFile()));
+            } catch (Exception e) {
+                log.error("Error loading theme, falling back to default theme", e);
+                settings.setTheme(new SettingsDto().getTheme());
+                save();
+            }
         }
 
         FlatLaf.updateUI();