Changeset b123720

Timestamp:

Sep 24, 2016 2:54:30 PM (4 years ago)

Author:

zzz <zzz@…>

Branches:

master

Children:

d4f786c

Parents:

1376237

Message:

DTG: Enable by default on Windows

Location:

apps/routerconsole/java/src/net/i2p/router/web

Files:

• ConfigServiceHandler.java (modified) (1 diff)
• RouterConsoleRunner.java (modified) (1 diff)

apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java

@@ -215 +215 @@
      */
     public boolean isSystrayEnabled() {
-        return _context.getBooleanProperty(RouterConsoleRunner.PROP_DTG_ENABLED);
+        // default false for now, except on non-service windows
+        String sdtg = _context.getProperty(RouterConsoleRunner.PROP_DTG_ENABLED);
+        return Boolean.parseBoolean(sdtg) ||
+               (sdtg == null && SystemVersion.isWindows());
     }
 

apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java

@@ -282 +282 @@
         }
         try {
-            // default false for now
-            boolean desktopguiEnabled = _context.getBooleanProperty(PROP_DTG_ENABLED);
+            // default false for now, except on non-service windows
+            String sdtg = _context.getProperty(PROP_DTG_ENABLED);
+            boolean desktopguiEnabled = Boolean.parseBoolean(sdtg) ||
+                                        (sdtg == null && SystemVersion.isWindows());
             if (desktopguiEnabled) {
                 //Check if we are in a headless environment, set properties accordingly