From a6a642eb7eea7f7bdd4b3475e5039df4418e3056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 29 Oct 2017 09:15:10 +0100 Subject: GH-2026 only run versions with FirstThreadOnMacOS trait on first thread --- api/logic/minecraft/MinecraftInstance.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'api/logic/minecraft/MinecraftInstance.cpp') 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 -- cgit v1.2.3