Merge branch 'settings_reload' into 'master'

Support reload for settings values See merge request OpenMW/openmw!3543
OpenMW · Nov 1, 2023 · 8a8d77a · 8a8d77a
2 parents 6f4e7ed + ebfcb66
commit 8a8d77a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/components/settings/settings.cpp b/components/settings/settings.cpp
@@ -145,6 +145,8 @@ namespace Settings
 
     void Manager::clear()
     {
+        sInitialized.clear();
+        StaticValues::clear();
         mDefaultSettings.clear();
         mUserSettings.clear();
         mChangedSettings.clear();

diff --git a/components/settings/values.cpp b/components/settings/values.cpp
@@ -4,24 +4,29 @@
 
 namespace Settings
 {
-    Index* StaticValues::sIndex = nullptr;
-    Values* StaticValues::sValues = nullptr;
+    std::unique_ptr<Index> StaticValues::sIndex;
+    std::unique_ptr<Values> StaticValues::sDefaultValues;
+    std::unique_ptr<Values> StaticValues::sValues;
 
     void StaticValues::initDefaults()
     {
-        if (sValues != nullptr)
-            throw std::logic_error("Default settings already initialized");
-        static Index index;
-        static Values values(index);
-        sIndex = &index;
-        sValues = &values;
+        if (sDefaultValues != nullptr)
+            throw std::logic_error("Default settings are already initialized");
+        sIndex = std::make_unique<Index>();
+        sDefaultValues = std::make_unique<Values>(*sIndex);
     }
 
     void StaticValues::init()
     {
-        if (sValues == nullptr)
+        if (sDefaultValues == nullptr)
             throw std::logic_error("Default settings are not initialized");
-        static Values values(std::move(*sValues));
-        sValues = &values;
+        sValues = std::make_unique<Values>(std::move(*sDefaultValues));
+    }
+
+    void StaticValues::clear()
+    {
+        sValues = nullptr;
+        sDefaultValues = nullptr;
+        sIndex = nullptr;
     }
 }
diff --git a/components/settings/values.hpp b/components/settings/values.hpp
@@ -29,6 +29,7 @@
 #include "settingvalue.hpp"
 
 #include <cassert>
+#include <memory>
 #include <string_view>
 
 namespace Settings
@@ -71,9 +72,12 @@ namespace Settings
 
         static void init();
 
+        static void clear();
+
     private:
-        static Index* sIndex;
-        static Values* sValues;
+        static std::unique_ptr<Index> sIndex;
+        static std::unique_ptr<Values> sDefaultValues;
+        static std::unique_ptr<Values> sValues;
 
         friend Values& values();