* Systray: Better detection of 64-bit Windows (tickets #756, #912)

- Don't even instantiate systray unless on 32-bit Windows
This commit is contained in:
zzz
2013-04-17 14:49:25 +00:00
parent 6af73d087b
commit 9443a96f0c
4 changed files with 21 additions and 4 deletions

View File

@ -274,7 +274,9 @@ public class RouterConsoleRunner implements RouterApp {
} else {
// required true for jrobin to work
System.setProperty("java.awt.headless", "true");
SysTray.getInstance();
// this check is in SysTray but do it here too
if (SystemVersion.isWindows() && (!Boolean.getBoolean("systray.disable")) && (!SystemVersion.is64Bit()))
SysTray.getInstance();
}
} catch (Throwable t) {
t.printStackTrace();