From 20c528debe0901968c4363d2809152cf307eaf90 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Tue, 27 Apr 2021 10:58:17 -0400
Subject: [PATCH] Router: Cleanup fix for gitlab ticket #16
Only check for clients.config if there was no clients.config.d
---
router/java/src/net/i2p/router/startup/WorkingDir.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/router/java/src/net/i2p/router/startup/WorkingDir.java b/router/java/src/net/i2p/router/startup/WorkingDir.java
index bd8c2cfbc1..bf17f731b8 100644
--- a/router/java/src/net/i2p/router/startup/WorkingDir.java
+++ b/router/java/src/net/i2p/router/startup/WorkingDir.java
@@ -99,11 +99,13 @@ public class WorkingDir {
// then attempt to use, resulting in a router with no client applications. Checking
// for clients.config.d determines if the directory is "Real" or not.
File clientAppsConfig = new File(checkOld.getAbsolutePath(), "clients.config.d");
- if (routerConfig.exists() && clientAppsConfig.exists() && clientAppsConfig.isDirectory())
- home = appdata;
- clientAppsConfig = new File(checkOld.getAbsolutePath(), "clients.config");
- if (routerConfig.exists() && clientAppsConfig.exists())
+ if (routerConfig.exists() && clientAppsConfig.exists() && clientAppsConfig.isDirectory()) {
home = appdata;
+ } else {
+ clientAppsConfig = new File(checkOld.getAbsolutePath(), "clients.config");
+ if (routerConfig.exists() && clientAppsConfig.exists())
+ home = appdata;
+ }
}
}
dirf = new SecureDirectory(home, WORKING_DIR_DEFAULT_WINDOWS);
--
GitLab