diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-15 14:13:30 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-15 14:13:30 +0300 |
| commit | 535fb2c4d6af12b5dc8d39770aee8769833a6199 (patch) | |
| tree | ef6425c4ff7ecdc613ab2b5f6ffc52639e47598b /launcher/minecraft | |
| parent | 811c79423fa048c5f4dd567b1121630d16aa3b0c (diff) | |
| parent | 8bf5ba2836f8bb2d0555527947e80ea873515d03 (diff) | |
| download | PrismLauncher-535fb2c4d6af12b5dc8d39770aee8769833a6199.tar.gz PrismLauncher-535fb2c4d6af12b5dc8d39770aee8769833a6199.tar.bz2 PrismLauncher-535fb2c4d6af12b5dc8d39770aee8769833a6199.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into pre-lauch
Diffstat (limited to 'launcher/minecraft')
| -rw-r--r-- | launcher/minecraft/MinecraftInstance.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 2c624a36..f8ed5214 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -149,9 +149,10 @@ void MinecraftInstance::loadSpecificSettings() // special! m_settings->registerPassthrough(global_settings->getSetting("JavaTimestamp"), javaOrLocation); - m_settings->registerPassthrough(global_settings->getSetting("JavaVersion"), 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); |