forked from I2P_Developers/i2p.i2p
Bugfix: Don't load the systray in a 64bit JVM in Windows (closes #506)
This commit is contained in:
@ -37,6 +37,8 @@ public class SysTray implements SysTrayMenuListener {
|
|||||||
private static String _portString;
|
private static String _portString;
|
||||||
private static boolean _showIcon;
|
private static boolean _showIcon;
|
||||||
private static UrlLauncher _urlLauncher = new UrlLauncher();
|
private static UrlLauncher _urlLauncher = new UrlLauncher();
|
||||||
|
private static final boolean _is64 = "64".equals(System.getProperty("sun.arch.data.model")) ||
|
||||||
|
System.getProperty("os.arch").contains("64");
|
||||||
|
|
||||||
static {
|
static {
|
||||||
File config = new File(I2PAppContext.getGlobalContext().getConfigDir(), "systray.config");
|
File config = new File(I2PAppContext.getGlobalContext().getConfigDir(), "systray.config");
|
||||||
@ -52,7 +54,7 @@ public class SysTray implements SysTrayMenuListener {
|
|||||||
//if (!(new File("router.config")).exists())
|
//if (!(new File("router.config")).exists())
|
||||||
// openRouterConsole("http://localhost:" + _portString + "/index.jsp");
|
// openRouterConsole("http://localhost:" + _portString + "/index.jsp");
|
||||||
|
|
||||||
if ( (System.getProperty("os.name").startsWith("Windows")) && (!Boolean.getBoolean("systray.disable")) )
|
if ( (System.getProperty("os.name").startsWith("Windows")) && (!Boolean.getBoolean("systray.disable")) && (!_is64))
|
||||||
_instance = new SysTray();
|
_instance = new SysTray();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
2011-08-17 kytv
|
||||||
|
* Fix #506: Don't attempt to load systray4j when using a 64bit JVM
|
||||||
|
in Windows.
|
||||||
|
|
||||||
2011-08-16 zzz
|
2011-08-16 zzz
|
||||||
* Console: Tweak logs page CSS
|
* Console: Tweak logs page CSS
|
||||||
* Graphs: Delete corrupt rrd file (ticket #483)
|
* Graphs: Delete corrupt rrd file (ticket #483)
|
||||||
|
@ -18,7 +18,7 @@ public class RouterVersion {
|
|||||||
/** deprecated */
|
/** deprecated */
|
||||||
public final static String ID = "Monotone";
|
public final static String ID = "Monotone";
|
||||||
public final static String VERSION = CoreVersion.VERSION;
|
public final static String VERSION = CoreVersion.VERSION;
|
||||||
public final static long BUILD = 21;
|
public final static long BUILD = 22;
|
||||||
|
|
||||||
/** for example "-test" */
|
/** for example "-test" */
|
||||||
public final static String EXTRA = "-rc";
|
public final static String EXTRA = "-rc";
|
||||||
|
Reference in New Issue
Block a user