From 49c0766b734e0ed63cd375ed92754d5e55116362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Me=CC=81ndez?= <daniel.mendez@edreamsodigeo.com>
Date: Thu, 8 Apr 2021 00:20:52 +0200
Subject: [PATCH] settings: Save and load NAND/SD dirs from config

---
 src/citra/config.cpp                  |  4 ++++
 src/citra_qt/configuration/config.cpp | 12 ++++++++++++
 src/core/settings.h                   |  2 ++
 3 files changed, 18 insertions(+)

diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 88a36ed66..3364b791e 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -201,6 +201,10 @@ void Config::ReadValues() {
     // Data Storage
     Settings::values.use_virtual_sd =
         sdl2_config->GetBoolean("Data Storage", "use_virtual_sd", true);
+    Settings::values.nand_dir =
+        sdl2_config->Get("Data Storage", "nand_directory", FileUtil::GetUserPath(FileUtil::UserPath::NANDDir));
+    Settings::values.sdmc_dir =
+        sdl2_config->Get("Data Storage", "sdmc_directory", FileUtil::GetUserPath(FileUtil::UserPath::SDMCDir));
 
     // System
     Settings::values.is_new_3ds = sdl2_config->GetBoolean("System", "is_new_3ds", true);
diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp
index 8901c47c2..e14d01e0b 100644
--- a/src/citra_qt/configuration/config.cpp
+++ b/src/citra_qt/configuration/config.cpp
@@ -302,6 +302,14 @@ void Config::ReadDataStorageValues() {
     qt_config->beginGroup(QStringLiteral("Data Storage"));
 
     Settings::values.use_virtual_sd = ReadSetting(QStringLiteral("use_virtual_sd"), true).toBool();
+    std::string nan_dir = FileUtil::GetUserPath(FileUtil::UserPath::NANDDir);
+    Settings::values.nand_dir = ReadSetting(QStringLiteral("nand_directory"), QString::fromStdString(nan_dir))
+                                    .toString()
+                                    .toStdString();
+        std::string sdmc_dir = FileUtil::GetUserPath(FileUtil::UserPath::SDMCDir);
+    Settings::values.sdmc_dir = ReadSetting(QStringLiteral("sdmc_directory"), QString::fromStdString(sdmc_dir))
+                                    .toString()
+                                    .toStdString();
 
     qt_config->endGroup();
 }
@@ -852,6 +860,10 @@ void Config::SaveDataStorageValues() {
     qt_config->beginGroup(QStringLiteral("Data Storage"));
 
     WriteSetting(QStringLiteral("use_virtual_sd"), Settings::values.use_virtual_sd, true);
+    WriteSetting(QStringLiteral("nand_directory"),
+                                QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::NANDDir)));
+    WriteSetting(QStringLiteral("sdmc_directory"),
+                                QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::SDMCDir)));
 
     qt_config->endGroup();
 }
diff --git a/src/core/settings.h b/src/core/settings.h
index 0876d312f..af41b9a02 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -140,6 +140,8 @@ struct Values {
 
     // Data Storage
     bool use_virtual_sd;
+    std::string nand_dir;
+    std::string sdmc_dir;
 
     // System
     int region_value;