From fe6b09e8dd6b3b4bd8c53e1aebf4b491a2917784 Mon Sep 17 00:00:00 2001 From: nathan Date: Wed, 22 Feb 2017 14:32:30 +0100 Subject: [PATCH] Fixed erroneous warning messages for windows/mac. --- src/dorkbox/systemTray/SystemTray.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dorkbox/systemTray/SystemTray.java b/src/dorkbox/systemTray/SystemTray.java index 162dcce..635cad0 100644 --- a/src/dorkbox/systemTray/SystemTray.java +++ b/src/dorkbox/systemTray/SystemTray.java @@ -287,14 +287,14 @@ class SystemTray { // OSx can use Swing (non-native) or AWT (native) . // Linux can use Swing (non-native) menus + (native Icon via GTK or AppIndicator), GtkStatusIcon (native), or AppIndicator (native) if (OS.isWindows()) { - if (FORCE_TRAY_TYPE != TrayType.Swing) { + if (FORCE_TRAY_TYPE != TrayType.AutoDetect && FORCE_TRAY_TYPE != TrayType.Swing) { // windows MUST use swing only! FORCE_TRAY_TYPE = TrayType.AutoDetect; logger.warn("Windows cannot use the '" + FORCE_TRAY_TYPE + "' SystemTray type, defaulting to Swing"); } } else if (OS.isMacOsX()) { - if (FORCE_TRAY_TYPE != TrayType.Swing ) { + if (FORCE_TRAY_TYPE != TrayType.AutoDetect && FORCE_TRAY_TYPE != TrayType.Swing && FORCE_TRAY_TYPE != TrayType.AWT) { // MacOsX MUST use swing (and AWT) only! FORCE_TRAY_TYPE = TrayType.AutoDetect; logger.warn("MacOS cannot use the '" + FORCE_TRAY_TYPE + "' SystemTray type, defaulting to Awt");