From 10fd8eb7093eb7927a0753a35b8405908d7827cd Mon Sep 17 00:00:00 2001 From: hagen Date: Wed, 3 Feb 2016 11:22:00 +0000 Subject: [PATCH] * Daemon.cpp : move ParseCmdline() before use of i2p::fs -- allow redefined paths --- Daemon.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Daemon.cpp b/Daemon.cpp index 7da64883..54ebbea8 100644 --- a/Daemon.cpp +++ b/Daemon.cpp @@ -60,6 +60,9 @@ namespace i2p bool Daemon_Singleton::init(int argc, char* argv[]) { + i2p::config::Init(); + i2p::config::ParseCmdline(argc, argv); + std::string config = i2p::util::filesystem::GetConfigFile().string(); std::string tunconf = i2p::util::filesystem::GetTunnelsConfigFile().string(); std::string datadir = i2p::util::filesystem::GetDataDir().string(); @@ -69,8 +72,6 @@ namespace i2p LogPrint(eLogDebug, "FS: tunnels config: ", tunconf); LogPrint(eLogDebug, "FS: data directory: ", datadir); - i2p::config::Init(); - i2p::config::ParseCmdline(argc, argv); i2p::config::ParseConfig(config); i2p::config::Finalize();