diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-03-25 09:26:11 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-03-25 09:26:11 +0100 |
| commit | c61fe44194ea6d549adfe9ae944ce6fa3a467e0f (patch) | |
| tree | 771e6d98297d33e7250c8c8a4d208d5d36b76cee /src/qt | |
| parent | 7e591c19e70a151390eb2c0f83c3836178b76ee6 (diff) | |
| download | bitcoin-c61fe44194ea6d549adfe9ae944ce6fa3a467e0f.tar.xz | |
qt: Only override -datadir if different from the default
Fixes #3905.
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/intro.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 26efc4a788..f342606495 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -189,7 +189,12 @@ void Intro::pickDataDirectory() settings.setValue("strDataDir", dataDir); } - SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string()); // use OS locale for path setting + /* 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 } void Intro::setStatus(int status, const QString &message, quint64 bytesAvailable) |