aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorTheKodeToad <TheKodeToad@proton.me>2023-06-15 12:11:32 +0100
committerGitHub <noreply@github.com>2023-06-15 12:11:32 +0100
commit8bf5ba2836f8bb2d0555527947e80ea873515d03 (patch)
tree3f14030e394223d85ce7742f161aeb2b53a23672 /launcher
parent798e1abb581e5a73f9a0df12ae84e7dc33118db6 (diff)
parent7ad9abf9bce2f2d7ec0e9e6848673753fefba3dd (diff)
downloadPrismLauncher-8bf5ba2836f8bb2d0555527947e80ea873515d03.tar.gz
PrismLauncher-8bf5ba2836f8bb2d0555527947e80ea873515d03.tar.bz2
PrismLauncher-8bf5ba2836f8bb2d0555527947e80ea873515d03.zip
Merge pull request #1195 from Scrumplex/fix-javavendor-instance
Add JavaVendor as an instance override
Diffstat (limited to 'launcher')
-rw-r--r--launcher/minecraft/MinecraftInstance.cpp3
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);