From 177a6f4a683bdefa0707e426c746f1c5deaf8d20 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 27 Nov 2015 20:52:29 +0100
Subject: [PATCH] Launcher: ensure to clear previous settings when reloading
 settings

---
 apps/launcher/maindialog.cpp       | 4 ++++
 components/config/gamesettings.cpp | 8 ++++++++
 components/config/gamesettings.hpp | 2 ++
 components/config/settingsbase.hpp | 5 +++++
 4 files changed, 19 insertions(+)

diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index a979a2125e..60ae5b3a07 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -257,6 +257,8 @@ void Launcher::MainDialog::changePage(QListWidgetItem *current, QListWidgetItem
 
 bool Launcher::MainDialog::setupLauncherSettings()
 {
+    mLauncherSettings.clear();
+
     mLauncherSettings.setMultiValueEnabled(true);
 
     QString userPath = QString::fromUtf8(mCfgMgr.getUserConfigPath().string().c_str());
@@ -289,6 +291,8 @@ bool Launcher::MainDialog::setupLauncherSettings()
 
 bool Launcher::MainDialog::setupGameSettings()
 {
+    mGameSettings.clear();
+
     QString userPath = QString::fromUtf8(mCfgMgr.getUserConfigPath().string().c_str());
     QString globalPath = QString::fromUtf8(mCfgMgr.getGlobalPath().string().c_str());
 
diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp
index ca6bfd80da..a897806c2a 100644
--- a/components/config/gamesettings.cpp
+++ b/components/config/gamesettings.cpp
@@ -454,3 +454,11 @@ QStringList Config::GameSettings::getContentList() const
     return Config::LauncherSettings::reverse(values(sContentKey));
 }
 
+void Config::GameSettings::clear()
+{
+    mSettings.clear();
+    mUserSettings.clear();
+    mDataDirs.clear();
+    mDataLocal.clear();
+}
+
diff --git a/components/config/gamesettings.hpp b/components/config/gamesettings.hpp
index 992a3e5655..eeac893c23 100644
--- a/components/config/gamesettings.hpp
+++ b/components/config/gamesettings.hpp
@@ -72,6 +72,8 @@ namespace Config
         void setContentList(const QStringList& fileNames);
         QStringList getContentList() const;
 
+        void clear();
+
     private:
         Files::ConfigurationManager &mCfgMgr;
 
diff --git a/components/config/settingsbase.hpp b/components/config/settingsbase.hpp
index c798d2893b..08cd0bfc6f 100644
--- a/components/config/settingsbase.hpp
+++ b/components/config/settingsbase.hpp
@@ -101,6 +101,11 @@ namespace Config
             return true;
         }
 
+        void clear()
+        {
+            mSettings.clear();
+        }
+
     private:
         Map mSettings;