diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-19 12:20:50 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-19 12:20:50 +0300 |
| commit | ec063470d76890d865ea68406ebb1a3a40fa14b1 (patch) | |
| tree | 7cecd533df5f211ec8d8dbe896c99d34bae27cfc /launcher/minecraft/MinecraftInstance.cpp | |
| parent | 6667ff9330cc080ca3c5fc2dd90af6b8420bf3fc (diff) | |
| parent | 9d22fce53fef7481ad6804aac62c63c4e5411dcc (diff) | |
| download | PrismLauncher-ec063470d76890d865ea68406ebb1a3a40fa14b1.tar.gz PrismLauncher-ec063470d76890d865ea68406ebb1a3a40fa14b1.tar.bz2 PrismLauncher-ec063470d76890d865ea68406ebb1a3a40fa14b1.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into mods_txt
Diffstat (limited to 'launcher/minecraft/MinecraftInstance.cpp')
| -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); |