From 01f3e0e90a904d87cb51e8e32c2926e5873db1ac Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 12 Oct 2016 18:17:50 +0200 Subject: [PATCH] Fixed logic for AWT tray implelmentions --- src/dorkbox/systemTray/SystemTray.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/dorkbox/systemTray/SystemTray.java b/src/dorkbox/systemTray/SystemTray.java index a5b4abc..f4e15b0 100644 --- a/src/dorkbox/systemTray/SystemTray.java +++ b/src/dorkbox/systemTray/SystemTray.java @@ -594,7 +594,7 @@ class SystemTray implements Menu { // if it's linux + native menus must not start on the EDT! // _AwtTray must be constructed on the EDT however... if (isJavaFxLoaded || isSwtLoaded || - (OS.isLinux() && NativeUI.class.isAssignableFrom(trayType) && trayType == _AwtTray.class)) { + (OS.isLinux() && NativeUI.class.isAssignableFrom(trayType) && trayType != _AwtTray.class)) { try { reference.set((Menu) trayType.getConstructors()[0].newInstance(systemTray)); logger.info("Successfully Loaded: {}", trayType.getSimpleName()); @@ -603,7 +603,6 @@ class SystemTray implements Menu { } } else { // have to construct swing stuff inside the swing EDT - // this is the safest way to do this. final Class finalTrayType = trayType; SwingUtil.invokeAndWait(new Runnable() { @Override