diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-05-04 01:20:48 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-05-04 01:20:48 +0200 |
| commit | 1b884d0a9dc28d8bca38fe8756482d991d0ea850 (patch) | |
| tree | fabe4350a3d64123ad0801fe7c285c2150f9562b /logic/minecraft/MinecraftInstance.cpp | |
| parent | 8e9d5f56b592fd0dd0f54e747a835391a775120d (diff) | |
| download | MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.tar MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.tar.gz MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.tar.lz MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.tar.xz MultiMC-1b884d0a9dc28d8bca38fe8756482d991d0ea850.zip | |
GH-907 improve Java testing and PermGen deprecation handling
Diffstat (limited to 'logic/minecraft/MinecraftInstance.cpp')
| -rw-r--r-- | logic/minecraft/MinecraftInstance.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/logic/minecraft/MinecraftInstance.cpp b/logic/minecraft/MinecraftInstance.cpp index e4273cb9..2813a609 100644 --- a/logic/minecraft/MinecraftInstance.cpp +++ b/logic/minecraft/MinecraftInstance.cpp @@ -9,11 +9,15 @@ MinecraftInstance::MinecraftInstance(SettingsObjectPtr globalSettings, SettingsO { // Java Settings m_settings->registerSetting("OverrideJava", false); - m_settings->registerSetting("OverrideJavaLocation", false); + auto locationOverride = m_settings->registerSetting("OverrideJavaLocation", false); m_settings->registerSetting("OverrideJavaArgs", false); m_settings->registerOverride(globalSettings->getSetting("JavaPath")); m_settings->registerOverride(globalSettings->getSetting("JvmArgs")); + // special! + m_settings->registerPassthrough(globalSettings->getSetting("JavaTimestamp"), locationOverride); + m_settings->registerPassthrough(globalSettings->getSetting("JavaVersion"), locationOverride); + // Window Size m_settings->registerSetting("OverrideWindow", false); m_settings->registerOverride(globalSettings->getSetting("LaunchMaximized")); |