diff options
| author | TheKodeToad <TheKodeToad@proton.me> | 2023-07-17 17:40:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-17 17:40:42 +0100 |
| commit | 01afa8957f477d347c5103305a038a30edd24ca2 (patch) | |
| tree | f063ef3bf75f0a96b34d2ca75770764a5998bf69 /launcher | |
| parent | e8c44e700d68078ec4242347b505ed2bddabbe06 (diff) | |
| parent | 2be630904f89c9308d3e0bab94eb9e5a4fa6ae03 (diff) | |
| download | PrismLauncher-01afa8957f477d347c5103305a038a30edd24ca2.tar.gz PrismLauncher-01afa8957f477d347c5103305a038a30edd24ca2.tar.bz2 PrismLauncher-01afa8957f477d347c5103305a038a30edd24ca2.zip | |
Merge pull request #1387 from Scrumplex/fix-quilt-beacon
Check if any modloader is installed
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/minecraft/MinecraftInstance.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index 0833d591..342e634f 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -396,8 +396,11 @@ QStringList MinecraftInstance::extraArguments() agent->library()->getApplicableFiles(runtimeContext(), jar, temp1, temp2, temp3, getLocalLibraryPath()); list.append("-javaagent:"+jar[0]+(agent->argument().isEmpty() ? "" : "="+agent->argument())); } - if (version->getModLoaders().value() & ResourceAPI::Quilt && settings()->get("DisableQuiltBeacon").toBool()) { - list.append("-Dloader.disable_beacon=true"); + + { + const auto loaders = version->getModLoaders(); + if (loaders.has_value() && loaders.value() & ResourceAPI::Quilt && settings()->get("DisableQuiltBeacon").toBool()) + list.append("-Dloader.disable_beacon=true"); } return list; } |