diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java index cd2129356e691ff7c3ba3dda20912bb83fec66a4..76ba3c847b3e0c8a7ed73c6503ef6f85e752674e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java @@ -214,7 +214,10 @@ public class ConfigServiceHandler extends FormHandler { * @since 0.9.26 */ 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()); } @Override diff --git a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java index 0c8064d304c2b75638388b82c05deda17b0a9371..b37ed050de97174a419737464a1e2e390982f5e4 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java @@ -281,8 +281,10 @@ public class RouterConsoleRunner implements RouterApp { return; } 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 System.setProperty("java.awt.headless", Boolean.toString(GraphicsEnvironment.isHeadless()));