BTCPrivate
/
BitcoinPrivate-legacy
mirror of https://github.com/BTCPrivate/BitcoinPrivate-legacy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of github.com:z-classic/zclassic into dev

This commit is contained in:
Rhett Creighton 2016-11-05 20:40:51 -07:00
parent 1400d0525e 02cbc5dbbc
commit 11581fcdaf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util.cpp
View File

@ -521,7 +521,7 @@ void ClearDatadirCache()
boost::filesystem::path GetConfigFile()
{
boost::filesystem::path pathConfigFile(GetArg("-conf", "zcash.conf"));
boost::filesystem::path pathConfigFile(GetArg("-conf", "zclassic.conf"));
if (!pathConfigFile.is_complete())
pathConfigFile = GetDataDir(false) / pathConfigFile;
@ -533,14 +533,14 @@ void ReadConfigFile(map<string, string>& mapSettingsRet,
{
boost::filesystem::ifstream streamConfig(GetConfigFile());
if (!streamConfig.good())
return; // No zcash.conf file is OK
return; // No zclassic.conf file is OK
set<string> setOptions;
setOptions.insert("*");
for (boost::program_options::detail::config_file_iterator it(streamConfig, setOptions), end; it != end; ++it)
{
// Don't overwrite existing settings so command line settings override zcash.conf
// Don't overwrite existing settings so command line settings override zclassic.conf
string strKey = string("-") + it->string_key;
if (mapSettingsRet.count(strKey) == 0)
{