phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-28 12:07:32 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

qt: Only override -datadir if different from the default

Browse source 
Fixes #3905.
This commit is contained in:
Wladimir J. van der Laan 2014-03-25 09:26:11 +01:00
parent 7e591c19e7
commit c61fe44194
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/qt/intro.cpp
View file

@ -189,6 +189,11 @@ void Intro::pickDataDirectory()
settings.setValue("strDataDir", dataDir); settings.setValue("strDataDir", dataDir);
} }
/* Only override -datadir if different from the default, to make it possible to
* override -datadir in the bitcoin.conf file in the default data directory
* (to be consistent with bitcoind behavior)
*/
if(dataDir != getDefaultDataDirectory())
SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting
} }