From a66422fa3c1630b54ee768a7429cb3fd02806222 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Sat, 28 Aug 2021 09:05:38 -0400
Subject: [PATCH] Console: Catch error checking systray availability (gitlab
issue !331)
---
.../src/net/i2p/router/web/ConfigServiceHandler.java | 10 ++++++++--
1 file changed, 8 insertions(+), 2 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 be35815911..71a2e410b9 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java
@@ -203,8 +203,14 @@ public class ConfigServiceHandler extends FormHandler {
* @since 0.9.26
*/
public boolean shouldShowSystray() {
- return SystemTray.isSupported() &&
- !SystemVersion.isService() &&
+ try {
+ if (!SystemTray.isSupported())
+ return false;
+ } catch (Throwable t) {
+ // java.lang.NoClassDefFoundError: Could not initialize class java.awt.Toolkit
+ return false;
+ }
+ return !SystemVersion.isService() &&
!(SystemVersion.isWindows() && _context.hasWrapper() && WrapperManager.isLaunchedAsService());
}
--
GitLab