diff options
| author | Andrew Chow <achow101@gmail.com> | 2016-08-10 15:35:22 -0400 |
|---|---|---|
| committer | Andrew Chow <achow101@gmail.com> | 2016-08-24 09:40:48 -0400 |
| commit | 57acb82e7014f3214229349485fa3f57842b10ae (patch) | |
| tree | 74318638715861ecf66e5ff177b3b15ef717e422 /src/qt/intro.cpp | |
| parent | 15df3c196b2359505980a2b0217133e0bb550565 (diff) | |
| download | bitcoin-57acb82e7014f3214229349485fa3f57842b10ae.tar.xz | |
Load choose datadir dialog after options reset
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 6d6af54290..390bcd22fb 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -178,7 +178,7 @@ void 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 @@ void 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 |