ihateninjas/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher synced 2026-04-23 09:05:03 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix: don't manually check for instance overrides

Browse source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2026-01-21 16:11:25 +05:00
parent ca5e1e0f1b
commit 06d9079be1
No known key found for this signature in database
GPG key ID: B77C34313AEE1FFF
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
launcher/minecraft/MinecraftInstance.cpp
View file

@ -683,12 +683,7 @@ QProcessEnvironment MinecraftInstance::createEnvironment()
env.insert(iter.key(), iter.value().toString());
};
bool overrideEnv = settings()->get("OverrideEnv").toBool();
if (!overrideEnv)
insertEnv(APPLICATION->settings()->get("Env").toString());
else
insertEnv(settings()->get("Env").toString());
insertEnv(settings()->get("Env").toString());
return env;
}
@ -1010,7 +1005,7 @@ QStringList MinecraftInstance::verboseDescription(AuthSessionPtr session, Minecr
out << emptyLine;
// environment variables
const QString env = settings->get("OverrideEnv").toBool() ? settings->get("Env").toString() : APPLICATION->settings()->get("Env").toString();
const QString env = settings->get("Env").toString();
if (auto envMap = Json::toMap(env); !envMap.isEmpty()) {
out << "Custom environment variables:";
for (auto [key, value] : envMap.asKeyValueRange()) {