diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-09-05 17:45:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-05 17:45:17 +0200 |
| commit | 8e3356f11a81cba394f57567e7521c3ccc2c3afa (patch) | |
| tree | 12c44b9a4eeb96a63e433dd88b8eba5d6c45ac8b /launcher/minecraft | |
| parent | 2f167b1512dc0c3b80731ae412d55ee897da14fd (diff) | |
| parent | d82bb29919d1cc6a9ead4a4e4a18d7b02c5221eb (diff) | |
| download | PrismLauncher-8e3356f11a81cba394f57567e7521c3ccc2c3afa.tar.gz PrismLauncher-8e3356f11a81cba394f57567e7521c3ccc2c3afa.tar.bz2 PrismLauncher-8e3356f11a81cba394f57567e7521c3ccc2c3afa.zip | |
Merge pull request #1034 from Scrumplex/detect-performance-features
Diffstat (limited to 'launcher/minecraft')
| -rw-r--r-- | launcher/minecraft/MinecraftInstance.cpp | 4 | ||||
| -rw-r--r-- | launcher/minecraft/launch/DirectJavaLaunch.cpp | 4 | ||||
| -rw-r--r-- | launcher/minecraft/launch/LauncherPartLaunch.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/launcher/minecraft/MinecraftInstance.cpp b/launcher/minecraft/MinecraftInstance.cpp index cf127525..b1c7a050 100644 --- a/launcher/minecraft/MinecraftInstance.cpp +++ b/launcher/minecraft/MinecraftInstance.cpp @@ -455,13 +455,11 @@ QProcessEnvironment MinecraftInstance::createLaunchEnvironment() QProcessEnvironment env = createEnvironment(); #ifdef Q_OS_LINUX - if (settings()->get("EnableMangoHud").toBool()) + if (settings()->get("EnableMangoHud").toBool() && APPLICATION->capabilities() & Application::SupportsMangoHud) { auto preload = env.value("LD_PRELOAD", "") + ":libMangoHud_dlsym.so:libMangoHud.so"; - auto lib_path = env.value("LD_LIBRARY_PATH", "") + ":/usr/local/$LIB/mangohud/:/usr/$LIB/mangohud/"; env.insert("LD_PRELOAD", preload); - env.insert("LD_LIBRARY_PATH", lib_path); env.insert("MANGOHUD", "1"); } diff --git a/launcher/minecraft/launch/DirectJavaLaunch.cpp b/launcher/minecraft/launch/DirectJavaLaunch.cpp index 152485b3..ca55cd2e 100644 --- a/launcher/minecraft/launch/DirectJavaLaunch.cpp +++ b/launcher/minecraft/launch/DirectJavaLaunch.cpp @@ -21,6 +21,8 @@ #include <FileSystem.h> #include <Commandline.h> +#include "Application.h" + #ifdef Q_OS_LINUX #include "gamemode_client.h" #endif @@ -86,7 +88,7 @@ void DirectJavaLaunch::executeTask() } #ifdef Q_OS_LINUX - if (instance->settings()->get("EnableFeralGamemode").toBool()) + if (instance->settings()->get("EnableFeralGamemode").toBool() && APPLICATION->capabilities() & Application::SupportsGameMode) { auto pid = m_process.processId(); if (pid) diff --git a/launcher/minecraft/launch/LauncherPartLaunch.cpp b/launcher/minecraft/launch/LauncherPartLaunch.cpp index 3b905bf5..3df4e541 100644 --- a/launcher/minecraft/launch/LauncherPartLaunch.cpp +++ b/launcher/minecraft/launch/LauncherPartLaunch.cpp @@ -162,7 +162,7 @@ void LauncherPartLaunch::executeTask() } #ifdef Q_OS_LINUX - if (instance->settings()->get("EnableFeralGamemode").toBool()) + if (instance->settings()->get("EnableFeralGamemode").toBool() && APPLICATION->capabilities() & Application::SupportsGameMode) { auto pid = m_process.processId(); if (pid) |