diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-28 18:29:04 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-28 18:29:04 +0300 |
| commit | 8f9bd9617fc9f555b4814993ecbe70802fa5817c (patch) | |
| tree | b56cc29a97aeab37b4c9ef8cdf4e7ebe030fdd6f /launcher/minecraft/MinecraftInstance.cpp | |
| parent | 1ff8136f98cf3bb2983043fcaaf3e65366b4e6d4 (diff) | |
| parent | faec21d572549793293bf41127e384811f8a66dc (diff) | |
| download | PrismLauncher-8f9bd9617fc9f555b4814993ecbe70802fa5817c.tar.gz PrismLauncher-8f9bd9617fc9f555b4814993ecbe70802fa5817c.tar.bz2 PrismLauncher-8f9bd9617fc9f555b4814993ecbe70802fa5817c.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into scale_cat
Diffstat (limited to 'launcher/minecraft/MinecraftInstance.cpp')
| -rw-r--r-- | launcher/minecraft/MinecraftInstance.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 2c624a36..aab930de 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -148,10 +148,11 @@ void MinecraftInstance::loadSpecificSettings() m_settings->registerOverride(global_settings->getSetting("IgnoreJavaCompatibility"), javaOrLocation); // special! - m_settings->registerPassthrough(global_settings->getSetting("JavaTimestamp"), javaOrLocation); - m_settings->registerPassthrough(global_settings->getSetting("JavaVersion"), javaOrLocation); + m_settings->registerPassthrough(global_settings->getSetting("JavaSignature"), javaOrLocation); m_settings->registerPassthrough(global_settings->getSetting("JavaArchitecture"), javaOrLocation); m_settings->registerPassthrough(global_settings->getSetting("JavaRealArchitecture"), javaOrLocation); + m_settings->registerPassthrough(global_settings->getSetting("JavaVersion"), javaOrLocation); + m_settings->registerPassthrough(global_settings->getSetting("JavaVendor"), javaOrLocation); // Window Size auto windowSetting = m_settings->registerSetting("OverrideWindow", false); |