From 15df3c196b2359505980a2b0217133e0bb550565 Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101@gmail.com>
Date: Mon, 8 Aug 2016 14:17:23 -0400
Subject: [PATCH 1/2] Persist the datadir after option reset

After a reset is performed, the datadir setting is saved and readded to the settings so that it is persisted across option resets.
---
 src/qt/optionsmodel.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 684db71a8..7987d8e7e 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -16,6 +16,7 @@
 #include "main.h" // For DEFAULT_SCRIPTCHECK_THREADS
 #include "net.h"
 #include "txdb.h" // for -dbcache defaults
+#include "intro.h" 
 
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
@@ -98,6 +99,9 @@ void OptionsModel::Init(bool resetSettings)
     if (!SoftSetArg("-par", settings.value("nThreadsScriptVerif").toString().toStdString()))
         addOverriddenOption("-par");
 
+    if (!settings.contains("strDataDir"))
+        settings.setValue("strDataDir", Intro::getDefaultDataDirectory());
+
     // Wallet
 #ifdef ENABLE_WALLET
     if (!settings.contains("bSpendZeroConfChange"))
@@ -150,9 +154,16 @@ void OptionsModel::Reset()
 {
     QSettings settings;
 
+    // Save the strDataDir setting
+    QString dataDir = Intro::getDefaultDataDirectory();
+    dataDir = settings.value("strDataDir", dataDir).toString();
+
     // Remove all entries from our QSettings object
     settings.clear();
 
+    // Set strDataDir
+    settings.setValue("strDataDir", dataDir);
+
     // default setting for OptionsModel::StartAtStartup - disabled
     if (GUIUtil::GetStartOnSystemStartup())
         GUIUtil::SetStartOnSystemStartup(false);

From 57acb82e7014f3214229349485fa3f57842b10ae Mon Sep 17 00:00:00 2001
From: Andrew Chow <achow101@gmail.com>
Date: Wed, 10 Aug 2016 15:35:22 -0400
Subject: [PATCH 2/2] Load choose datadir dialog after options reset

---
 src/qt/intro.cpp        | 3 ++-
 src/qt/optionsmodel.cpp | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
index 6d6af5429..390bcd22f 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
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 7987d8e7e..5538a2841 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -164,6 +164,9 @@ void OptionsModel::Reset()
     // Set strDataDir
     settings.setValue("strDataDir", dataDir);
 
+    // Set that this was reset
+    settings.setValue("fReset", true);
+
     // default setting for OptionsModel::StartAtStartup - disabled
     if (GUIUtil::GetStartOnSystemStartup())
         GUIUtil::SetStartOnSystemStartup(false);