AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Router: Cleanup fix for gitlab ticket #16

Browse Source 
Only check for clients.config if there was no clients.config.d
This commit is contained in:
zzz
2021-04-27 10:58:17 -04:00
parent 9f23102428
commit 20c528debe
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
router/java/src/net/i2p/router/startup/WorkingDir.java
View File

@@ -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);