From 20516c3f52c46374fd72457319d2b2e14ac19b7f Mon Sep 17 00:00:00 2001
From: Artem Shubovych <shybovycha@gmail.com>
Date: Tue, 18 Mar 2025 15:40:43 +1100
Subject: [PATCH] Fix class loader checks fallback

---
 src/dorkbox/systemTray/util/SystemTrayFixes.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/dorkbox/systemTray/util/SystemTrayFixes.java b/src/dorkbox/systemTray/util/SystemTrayFixes.java
index 5cb943c..1fdd549 100644
--- a/src/dorkbox/systemTray/util/SystemTrayFixes.java
+++ b/src/dorkbox/systemTray/util/SystemTrayFixes.java
@@ -63,7 +63,12 @@ boolean isSwingTrayLoaded(String className) {
         try {
             ClassLoader cl = ClassLoader.getSystemClassLoader();
             // if we are using swing, the classes are already created. We cannot fix things when it's already loaded.
-            return ClassUtils.isClassLoaded(cl, className) || ClassUtils.isClassLoaded(cl, "java.awt.SystemTray");
+
+            try {
+                return ClassUtils.isClassLoaded(cl, className);
+            } catch (Throwable e) {
+                return ClassUtils.isClassLoaded(cl, "java.awt.SystemTray");
+            }
         } catch (Throwable e) {
             if (SystemTray.DEBUG) {
                 logger.debug("Error detecting if the Swing SystemTray is loaded, unexpected error.", e);