From 0b8fbfabe005aced4c78d01ca72754a57ccb1b78 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sat, 23 Mar 2024 13:11:05 +0000
Subject: [PATCH] Improve font loading check

---
 .../app/core/check/AppFontLoadingCheck.java   | 20 ++-----------------
 .../java/io/xpipe/app/util/PlatformState.java |  2 +-
 2 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/core/check/AppFontLoadingCheck.java b/app/src/main/java/io/xpipe/app/core/check/AppFontLoadingCheck.java
index b251a201..2acb07a8 100644
--- a/app/src/main/java/io/xpipe/app/core/check/AppFontLoadingCheck.java
+++ b/app/src/main/java/io/xpipe/app/core/check/AppFontLoadingCheck.java
@@ -1,31 +1,15 @@
 package io.xpipe.app.core.check;
 
-import io.xpipe.core.util.XPipeInstallation;
 import javafx.scene.text.Font;
 
 public class AppFontLoadingCheck {
 
-    public static void init() {
-        if (canLoadFonts()) {
-            return;
-        }
-
-        if (System.getProperty("prism.fontdir") != null) {
-            throw new IllegalStateException("Unable to load bundled fonts");
-        }
-
-        System.setProperty("prism.fontdir", XPipeInstallation.getBundledFontsPath().toString());
-        System.setProperty("prism.embeddedfonts", "true");
-        init();
-    }
-
-    private static boolean canLoadFonts() {
+    public static void check() {
         try {
             // This can fail if the found system fonts can somehow not be loaded
             Font.getDefault();
-            return true;
         } catch (Throwable e) {
-            return false;
+            throw new IllegalStateException("Unable to load fonts", e);
         }
     }
 }
diff --git a/app/src/main/java/io/xpipe/app/util/PlatformState.java b/app/src/main/java/io/xpipe/app/util/PlatformState.java
index defcd7a9..c69cfac4 100644
--- a/app/src/main/java/io/xpipe/app/util/PlatformState.java
+++ b/app/src/main/java/io/xpipe/app/util/PlatformState.java
@@ -111,7 +111,7 @@ public enum PlatformState {
             try {
                 latch.await();
                 // Check if we have no fonts and set properties to load bundled ones
-                AppFontLoadingCheck.init();
+                AppFontLoadingCheck.check();
                 PlatformState.setCurrent(PlatformState.RUNNING);
                 return Optional.empty();
             } catch (InterruptedException e) {