diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-19 00:06:44 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-19 00:06:44 +0300 |
| commit | 319ce8c19f801a4bec920c6778cf140e9f92ee32 (patch) | |
| tree | 6322b81bf4146ba98b5894ebbb8201a37cc8c044 /launcher/minecraft | |
| parent | 182e19eae3e2aa9f50dde140d10db858b5bf6076 (diff) | |
| parent | 12cd8a7bea991c2a8d4b59b1cfc9f7c246819fc9 (diff) | |
| download | PrismLauncher-319ce8c19f801a4bec920c6778cf140e9f92ee32.tar.gz PrismLauncher-319ce8c19f801a4bec920c6778cf140e9f92ee32.tar.bz2 PrismLauncher-319ce8c19f801a4bec920c6778cf140e9f92ee32.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
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); |