echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: Don't load the systray in a 64bit JVM in Windows (closes #506)

Browse Source
This commit is contained in:
kytv
2011-08-17 21:20:21 +00:00
parent a9f943154c
commit 3f979b159d
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/systray/java/src/net/i2p/apps/systray/SysTray.java
View File

@ -37,6 +37,8 @@ public class SysTray implements SysTrayMenuListener {
private static String _portString;
private static boolean _showIcon;
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 {
File config = new File(I2PAppContext.getGlobalContext().getConfigDir(), "systray.config");
@ -52,7 +54,7 @@ public class SysTray implements SysTrayMenuListener {
//if (!(new File("router.config")).exists())
// 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();
}

4
history.txt
View File

@ -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
* Console: Tweak logs page CSS
* Graphs: Delete corrupt rrd file (ticket #483)

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 21;
public final static long BUILD = 22;
/** for example "-test" */
public final static String EXTRA = "-rc";