From b123720fa3ab52cecc8b513acf107bdac37f8700 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 24 Sep 2016 14:54:30 +0000
Subject: [PATCH] DTG: Enable by default on Windows
---
.../java/src/net/i2p/router/web/ConfigServiceHandler.java | 5 ++++-
.../java/src/net/i2p/router/web/RouterConsoleRunner.java | 6 ++++--
2 files changed, 8 insertions(+), 3 deletions(-)
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 cd2129356e..76ba3c847b 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 0c8064d304..b37ed050de 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()));
--
GitLab