PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 04:04:16 +00:00
Code Issues Releases Activity

don't call mapArgs from GetDataDir because it's not initialized yet

Browse Source
This commit is contained in:
orignal 2014-03-12 07:21:58 -04:00
parent 5dfe19c6ed
commit 695f1949eb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
util.cpp
View File

@ -99,11 +99,12 @@ namespace filesystem
{ {
static boost::filesystem::path path; static boost::filesystem::path path;
if (i2p::util::config::mapArgs.count("-datadir")) { // TODO: datadir parameter is useless because GetDataDir is called before OptionParser
// and mapArgs is not initialized yet
/*if (i2p::util::config::mapArgs.count("-datadir"))
path = boost::filesystem::system_complete(i2p::util::config::mapArgs["-datadir"]); path = boost::filesystem::system_complete(i2p::util::config::mapArgs["-datadir"]);
} else { else */
path = GetDefaultDataDir(); path = GetDefaultDataDir();
}
if (!boost::filesystem::exists( path )) if (!boost::filesystem::exists( path ))
{ {
@ -115,9 +116,8 @@ namespace filesystem
return path; return path;
} }
} }
if (!boost::filesystem::is_directory(path)) { if (!boost::filesystem::is_directory(path))
path = GetDefaultDataDir(); path = GetDefaultDataDir();
}
return path; return path;
} }