change: put settings initialization in a separate function

Signed-off-by: flow <flowlnlnln@gmail.com>

2 files changed, 67 insertions, 53 deletions

diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp
index 889c6dde..debfa081 100644
--- a/launcher/minecraft/MinecraftInstance.cpp
+++ b/launcher/minecraft/MinecraftInstance.cpp
@@ -115,6 +115,21 @@ private:
 MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr settings, const QString &rootDir)
     : BaseInstance(globalSettings, settings, rootDir)
 {
+    loadSettingsIfNeeded();
+
+    m_components.reset(new PackProfile(this));
+}
+
+void MinecraftInstance::saveNow()
+{
+    m_components->saveNow();
+}
+
+void MinecraftInstance::loadSettingsIfNeeded()
+{
+    if (m_settings_loaded)
+        return;
+
     // Java Settings
     auto javaOverride = m_settings->registerSetting("OverrideJava", false);
     auto locationOverride = m_settings->registerSetting("OverrideJavaLocation", false);
@@ -124,64 +139,61 @@ MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsO
     auto javaOrLocation = std::make_shared<OrSetting>("JavaOrLocationOverride", javaOverride, locationOverride);
     auto javaOrArgs = std::make_shared<OrSetting>("JavaOrArgsOverride", javaOverride, argsOverride);
 
-    m_settings->registerOverride(globalSettings->getSetting("JavaPath"), javaOrLocation);
-    m_settings->registerOverride(globalSettings->getSetting("JvmArgs"), javaOrArgs);
-    m_settings->registerOverride(globalSettings->getSetting("IgnoreJavaCompatibility"), javaOrLocation);
-
-    // special!
-    m_settings->registerPassthrough(globalSettings->getSetting("JavaTimestamp"), javaOrLocation);
-    m_settings->registerPassthrough(globalSettings->getSetting("JavaVersion"), javaOrLocation);
-    m_settings->registerPassthrough(globalSettings->getSetting("JavaArchitecture"), javaOrLocation);
-
-    // Window Size
-    auto windowSetting = m_settings->registerSetting("OverrideWindow", false);
-    m_settings->registerOverride(globalSettings->getSetting("LaunchMaximized"), windowSetting);
-    m_settings->registerOverride(globalSettings->getSetting("MinecraftWinWidth"), windowSetting);
-    m_settings->registerOverride(globalSettings->getSetting("MinecraftWinHeight"), windowSetting);
-
-    // Memory
-    auto memorySetting = m_settings->registerSetting("OverrideMemory", false);
-    m_settings->registerOverride(globalSettings->getSetting("MinMemAlloc"), memorySetting);
-    m_settings->registerOverride(globalSettings->getSetting("MaxMemAlloc"), memorySetting);
-    m_settings->registerOverride(globalSettings->getSetting("PermGen"), memorySetting);
-
-    // Minecraft launch method
-    auto launchMethodOverride = m_settings->registerSetting("OverrideMCLaunchMethod", false);
-    m_settings->registerOverride(globalSettings->getSetting("MCLaunchMethod"), launchMethodOverride);
-
-    // Native library workarounds
-    auto nativeLibraryWorkaroundsOverride = m_settings->registerSetting("OverrideNativeWorkarounds", false);
-    m_settings->registerOverride(globalSettings->getSetting("UseNativeOpenAL"), nativeLibraryWorkaroundsOverride);
-    m_settings->registerOverride(globalSettings->getSetting("UseNativeGLFW"), nativeLibraryWorkaroundsOverride);
-
-    // Peformance related options
-    auto performanceOverride = m_settings->registerSetting("OverridePerformance", false);
-    m_settings->registerOverride(globalSettings->getSetting("EnableFeralGamemode"), performanceOverride);
-    m_settings->registerOverride(globalSettings->getSetting("EnableMangoHud"), performanceOverride);
-    m_settings->registerOverride(globalSettings->getSetting("UseDiscreteGpu"), performanceOverride);
-
-    // Game time
-    auto gameTimeOverride = m_settings->registerSetting("OverrideGameTime", false);
-    m_settings->registerOverride(globalSettings->getSetting("ShowGameTime"), gameTimeOverride);
-    m_settings->registerOverride(globalSettings->getSetting("RecordGameTime"), gameTimeOverride);
+    if (auto globalSettings = m_global_settings.lock()) {
+        m_settings->registerOverride(globalSettings->getSetting("JavaPath"), javaOrLocation);
+        m_settings->registerOverride(globalSettings->getSetting("JvmArgs"), javaOrArgs);
+        m_settings->registerOverride(globalSettings->getSetting("IgnoreJavaCompatibility"), javaOrLocation);
 
-    // Join server on launch, this does not have a global override
-    m_settings->registerSetting("JoinServerOnLaunch", false);
-    m_settings->registerSetting("JoinServerOnLaunchAddress", "");
+        // special!
+        m_settings->registerPassthrough(globalSettings->getSetting("JavaTimestamp"), javaOrLocation);
+        m_settings->registerPassthrough(globalSettings->getSetting("JavaVersion"), javaOrLocation);
+        m_settings->registerPassthrough(globalSettings->getSetting("JavaArchitecture"), javaOrLocation);
 
-    // Miscellaneous
-    auto miscellaneousOverride = m_settings->registerSetting("OverrideMiscellaneous", false);
-    m_settings->registerOverride(globalSettings->getSetting("CloseAfterLaunch"), miscellaneousOverride);
-    m_settings->registerOverride(globalSettings->getSetting("QuitAfterGameStop"), miscellaneousOverride);
+        // Window Size
+        auto windowSetting = m_settings->registerSetting("OverrideWindow", false);
+        m_settings->registerOverride(globalSettings->getSetting("LaunchMaximized"), windowSetting);
+        m_settings->registerOverride(globalSettings->getSetting("MinecraftWinWidth"), windowSetting);
+        m_settings->registerOverride(globalSettings->getSetting("MinecraftWinHeight"), windowSetting);
 
-    m_settings->set("InstanceType", "OneSix");
+        // Memory
+        auto memorySetting = m_settings->registerSetting("OverrideMemory", false);
+        m_settings->registerOverride(globalSettings->getSetting("MinMemAlloc"), memorySetting);
+        m_settings->registerOverride(globalSettings->getSetting("MaxMemAlloc"), memorySetting);
+        m_settings->registerOverride(globalSettings->getSetting("PermGen"), memorySetting);
 
-    m_components.reset(new PackProfile(this));
-}
+        // Minecraft launch method
+        auto launchMethodOverride = m_settings->registerSetting("OverrideMCLaunchMethod", false);
+        m_settings->registerOverride(globalSettings->getSetting("MCLaunchMethod"), launchMethodOverride);
 
-void MinecraftInstance::saveNow()
-{
-    m_components->saveNow();
+        // Native library workarounds
+        auto nativeLibraryWorkaroundsOverride = m_settings->registerSetting("OverrideNativeWorkarounds", false);
+        m_settings->registerOverride(globalSettings->getSetting("UseNativeOpenAL"), nativeLibraryWorkaroundsOverride);
+        m_settings->registerOverride(globalSettings->getSetting("UseNativeGLFW"), nativeLibraryWorkaroundsOverride);
+
+        // Peformance related options
+        auto performanceOverride = m_settings->registerSetting("OverridePerformance", false);
+        m_settings->registerOverride(globalSettings->getSetting("EnableFeralGamemode"), performanceOverride);
+        m_settings->registerOverride(globalSettings->getSetting("EnableMangoHud"), performanceOverride);
+        m_settings->registerOverride(globalSettings->getSetting("UseDiscreteGpu"), performanceOverride);
+
+        // Game time
+        auto gameTimeOverride = m_settings->registerSetting("OverrideGameTime", false);
+        m_settings->registerOverride(globalSettings->getSetting("ShowGameTime"), gameTimeOverride);
+        m_settings->registerOverride(globalSettings->getSetting("RecordGameTime"), gameTimeOverride);
+
+        // Miscellaneous
+        auto miscellaneousOverride = m_settings->registerSetting("OverrideMiscellaneous", false);
+        m_settings->registerOverride(globalSettings->getSetting("CloseAfterLaunch"), miscellaneousOverride);
+        m_settings->registerOverride(globalSettings->getSetting("QuitAfterGameStop"), miscellaneousOverride);
+
+        m_settings->set("InstanceType", "OneSix");
+    }
+
+    // Join server on launch, this does not have a global override
+    m_settings->registerSetting("JoinServerOnLaunch", false);
+    m_settings->registerSetting("JoinServerOnLaunchAddress", "");
+
+    m_settings_loaded = true;
 }
 
 QString MinecraftInstance::typeName() const
diff --git a/launcher/minecraft/MinecraftInstance.h b/launcher/minecraft/MinecraftInstance.h
index 05450d41..36d1d92d 100644
--- a/launcher/minecraft/MinecraftInstance.h
+++ b/launcher/minecraft/MinecraftInstance.h
@@ -20,6 +20,8 @@ public:
     virtual ~MinecraftInstance() {};
     virtual void saveNow() override;
 
+    void loadSettingsIfNeeded() override;
+
     // FIXME: remove
     QString typeName() const override;
     // FIXME: remove