Changeset 9443a96


Ignore:
Timestamp:
Apr 17, 2013 2:49:25 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
b64b262
Parents:
6af73d0
Message:
  • Systray: Better detection of 64-bit Windows (tickets #756, #912)
    • Don't even instantiate systray unless on 32-bit Windows
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

    r6af73d0 r9443a96  
    275275                // required true for jrobin to work
    276276                System.setProperty("java.awt.headless", "true");
    277                 SysTray.getInstance();
     277                // this check is in SysTray but do it here too
     278                if (SystemVersion.isWindows() && (!Boolean.getBoolean("systray.disable")) && (!SystemVersion.is64Bit()))
     279                    SysTray.getInstance();
    278280            }
    279281        } catch (Throwable t) {
  • core/java/src/net/i2p/util/SystemVersion.java

    r6af73d0 r9443a96  
    1919    private static final boolean _isApache;
    2020    private static final boolean _isGNU;
    21     private static final boolean _is64 = "64".equals(System.getProperty("sun.arch.data.model")) ||
    22                                          System.getProperty("os.arch").contains("64");
     21    private static final boolean _is64;
    2322    private static final boolean _hasWrapper = System.getProperty("wrapper.version") != null;
    2423
     
    2726
    2827    static {
     28        boolean is64 = "64".equals(System.getProperty("sun.arch.data.model")) ||
     29                       System.getProperty("os.arch").contains("64");
     30        if (_isWin && !is64) {
     31            // http://stackoverflow.com/questions/4748673/how-can-i-check-the-bitness-of-my-os-using-java-j2se-not-os-arch
     32            // http://blogs.msdn.com/b/david.wang/archive/2006/03/26/howto-detect-process-bitness.aspx
     33            String arch = System.getenv("PROCESSOR_ARCHITECTURE");
     34            String wow64Arch = System.getenv("PROCESSOR_ARCHITEW6432");
     35            is64 = (arch != null && arch.endsWith("64")) ||
     36                   (wow64Arch != null && wow64Arch.endsWith("64"));
     37        }
     38        _is64 = is64;
     39
    2940        String vendor = System.getProperty("java.vendor");
    3041        _isAndroid = vendor.contains("Android");
  • history.txt

    r6af73d0 r9443a96  
     12013-04-17 zzz
     2 * Console: Better handling of missing font for graphing (ticket #915)
     3 * Systray: Better detection of 64-bit Windows (tickets #756, #912)
     4
    152013-04-16 zzz
    26 * ClientAppManager: Add method to look up clients by class and args
  • router/java/src/net/i2p/router/RouterVersion.java

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