summaryrefslogtreecommitdiffstats
path: root/api/logic/minecraft
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2017-10-29 09:15:10 +0100
committerPetr Mrázek <peterix@gmail.com>2017-10-29 09:15:10 +0100
commita6a642eb7eea7f7bdd4b3475e5039df4418e3056 (patch)
tree2750fd8ba5e12df2499f688937da29e74a873754 /api/logic/minecraft
parentc78498f40ccc1d399fa6c29101207fcfb46caf8e (diff)
downloadMultiMC-a6a642eb7eea7f7bdd4b3475e5039df4418e3056.tar
MultiMC-a6a642eb7eea7f7bdd4b3475e5039df4418e3056.tar.gz
MultiMC-a6a642eb7eea7f7bdd4b3475e5039df4418e3056.tar.lz
MultiMC-a6a642eb7eea7f7bdd4b3475e5039df4418e3056.tar.xz
MultiMC-a6a642eb7eea7f7bdd4b3475e5039df4418e3056.zip
GH-2026 only run versions with FirstThreadOnMacOS trait on first thread
Diffstat (limited to 'api/logic/minecraft')
-rw-r--r--api/logic/minecraft/MinecraftInstance.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/api/logic/minecraft/MinecraftInstance.cpp b/api/logic/minecraft/MinecraftInstance.cpp
index 3e29a877..468b8ea1 100644
--- a/api/logic/minecraft/MinecraftInstance.cpp
+++ b/api/logic/minecraft/MinecraftInstance.cpp
@@ -298,10 +298,14 @@ QStringList MinecraftInstance::javaArguments() const
args << "-Xdock:icon=icon.png";
args << QString("-Xdock:name=\"%1\"").arg(windowTitle());
#endif
-
+ auto traits = m_profile->getTraits();
// HACK: fix issues on macOS with 1.13 snapshots
+ // NOTE: Oracle Java option. if there are alternate jvm implementations, this would be the place to customize this for them
#ifdef Q_OS_MAC
- args << QString("-XstartOnFirstThread");
+ if(traits.contains("FirstThreadOnMacOS"))
+ {
+ args << QString("-XstartOnFirstThread");
+ }
#endif
// HACK: Stupid hack for Intel drivers. See: https://mojang.atlassian.net/browse/MCL-767