diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-02-03 04:18:44 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-04-12 20:57:17 +0200 |
| commit | 473971b6e7a79ed38fa68dffacd207fda874fdc0 (patch) | |
| tree | 7f88d57347d5b674bc5e84f0d31b40952fb9c9fe | |
| parent | b47e196b32eaf44e8ce1a77af30b78ea54697c90 (diff) | |
| download | MultiMC-473971b6e7a79ed38fa68dffacd207fda874fdc0.tar MultiMC-473971b6e7a79ed38fa68dffacd207fda874fdc0.tar.gz MultiMC-473971b6e7a79ed38fa68dffacd207fda874fdc0.tar.lz MultiMC-473971b6e7a79ed38fa68dffacd207fda874fdc0.tar.xz MultiMC-473971b6e7a79ed38fa68dffacd207fda874fdc0.zip | |
NOISSUE fix overlap in instance settings registration
| -rw-r--r-- | logic/BaseInstance.cpp | 19 | ||||
| -rw-r--r-- | logic/minecraft/MinecraftInstance.cpp | 11 |
2 files changed, 0 insertions, 30 deletions
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp index 11b17bca..902c9e7e 100644 --- a/logic/BaseInstance.cpp +++ b/logic/BaseInstance.cpp @@ -39,30 +39,11 @@ BaseInstance::BaseInstance(SettingsObjectPtr globalSettings, SettingsObjectPtr s m_settings->registerSetting("notes", ""); m_settings->registerSetting("lastLaunchTime", 0); - // Java Settings - m_settings->registerSetting("OverrideJava", false); - m_settings->registerSetting("OverrideJavaLocation", false); - m_settings->registerSetting("OverrideJavaArgs", false); - m_settings->registerOverride(globalSettings->getSetting("JavaPath")); - m_settings->registerOverride(globalSettings->getSetting("JvmArgs")); - // Custom Commands m_settings->registerSetting({"OverrideCommands","OverrideLaunchCmd"}, false); m_settings->registerOverride(globalSettings->getSetting("PreLaunchCommand")); m_settings->registerOverride(globalSettings->getSetting("PostExitCommand")); - // Window Size - m_settings->registerSetting("OverrideWindow", false); - m_settings->registerOverride(globalSettings->getSetting("LaunchMaximized")); - m_settings->registerOverride(globalSettings->getSetting("MinecraftWinWidth")); - m_settings->registerOverride(globalSettings->getSetting("MinecraftWinHeight")); - - // Memory - m_settings->registerSetting("OverrideMemory", false); - m_settings->registerOverride(globalSettings->getSetting("MinMemAlloc")); - m_settings->registerOverride(globalSettings->getSetting("MaxMemAlloc")); - m_settings->registerOverride(globalSettings->getSetting("PermGen")); - // Console m_settings->registerSetting("OverrideConsole", false); m_settings->registerOverride(globalSettings->getSetting("ShowConsole")); diff --git a/logic/minecraft/MinecraftInstance.cpp b/logic/minecraft/MinecraftInstance.cpp index 11a29f04..93aeecd1 100644 --- a/logic/minecraft/MinecraftInstance.cpp +++ b/logic/minecraft/MinecraftInstance.cpp @@ -14,11 +14,6 @@ MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsO m_settings->registerOverride(globalSettings->getSetting("JavaPath")); m_settings->registerOverride(globalSettings->getSetting("JvmArgs")); - // Custom Commands - m_settings->registerSetting({"OverrideCommands","OverrideLaunchCmd"}, false); - m_settings->registerOverride(globalSettings->getSetting("PreLaunchCommand")); - m_settings->registerOverride(globalSettings->getSetting("PostExitCommand")); - // Window Size m_settings->registerSetting("OverrideWindow", false); m_settings->registerOverride(globalSettings->getSetting("LaunchMaximized")); @@ -30,12 +25,6 @@ MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsO m_settings->registerOverride(globalSettings->getSetting("MinMemAlloc")); m_settings->registerOverride(globalSettings->getSetting("MaxMemAlloc")); m_settings->registerOverride(globalSettings->getSetting("PermGen")); - - // Console - m_settings->registerSetting("OverrideConsole", false); - m_settings->registerOverride(globalSettings->getSetting("ShowConsole")); - m_settings->registerOverride(globalSettings->getSetting("AutoCloseConsole")); - m_settings->registerOverride(globalSettings->getSetting("LogPrePostOutput")); } QString MinecraftInstance::minecraftRoot() const |