diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-08-25 11:42:45 +0200 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-08-25 11:42:57 +0200 |
| commit | d26234a9e2fa93c5340330a9de612555fc329620 (patch) | |
| tree | 8e44777bddc1b9a3f022991e59fb61ab1b2965b1 /src/qt/intro.cpp | |
| parent | 95a983d56dbda457e3bf8766d59bac74c7aa5699 (diff) | |
| parent | 57acb82e7014f3214229349485fa3f57842b10ae (diff) | |
| download | bitcoin-d26234a9e2fa93c5340330a9de612555fc329620.tar.xz | |
Merge #8487: Persist the datadir after option reset
57acb82 Load choose datadir dialog after options reset (Andrew Chow)
15df3c1 Persist the datadir after option reset (Andrew Chow)
Diffstat (limited to 'src/qt/intro.cpp')
| -rw-r--r-- | src/qt/intro.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 6a5740e21d..1a241ae0f0 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -178,7 +178,7 @@ bool Intro::pickDataDirectory() /* 2) Allow QSettings to override default dir */ dataDir = settings.value("strDataDir", dataDir).toString(); - if(!fs::exists(GUIUtil::qstringToBoostPath(dataDir)) || GetBoolArg("-choosedatadir", DEFAULT_CHOOSE_DATADIR)) + if(!fs::exists(GUIUtil::qstringToBoostPath(dataDir)) || GetBoolArg("-choosedatadir", DEFAULT_CHOOSE_DATADIR) || settings.value("fReset", false).toBool() || GetBoolArg("-resetguisettings", false)) { /* If current default data directory does not exist, let the user choose one */ Intro intro; @@ -204,6 +204,7 @@ bool Intro::pickDataDirectory() } settings.setValue("strDataDir", dataDir); + settings.setValue("fReset", false); } /* 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 |