Changeset 3f979b1


Ignore:
Timestamp:
Aug 17, 2011 9:20:21 PM (10 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
2f5020e
Parents:
a9f94315
Message:

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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/systray/java/src/net/i2p/apps/systray/SysTray.java

    ra9f94315 r3f979b1  
    3838    private static boolean        _showIcon;
    3939    private static UrlLauncher    _urlLauncher    = new UrlLauncher();
     40    private static final boolean _is64 = "64".equals(System.getProperty("sun.arch.data.model")) ||
     41                                         System.getProperty("os.arch").contains("64");
    4042
    4143    static {
     
    5355        //    openRouterConsole("http://localhost:" + _portString + "/index.jsp");
    5456
    55         if ( (System.getProperty("os.name").startsWith("Windows")) && (!Boolean.getBoolean("systray.disable")) )
     57        if ( (System.getProperty("os.name").startsWith("Windows")) && (!Boolean.getBoolean("systray.disable")) && (!_is64))
    5658            _instance = new SysTray();
    5759    }
  • history.txt

    ra9f94315 r3f979b1  
     12011-08-17 kytv
     2  * Fix #506: Don't attempt to load systray4j when using a 64bit JVM
     3    in Windows.
     4
    152011-08-16 zzz
    26  * Console: Tweak logs page CSS
  • router/java/src/net/i2p/router/RouterVersion.java

    ra9f94315 r3f979b1  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 21;
     21    public final static long BUILD = 22;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.