mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-07-07 05:46:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: don't manually check for instance overrides

Browse source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
(cherry picked from commit 06d9079be1)
This commit is contained in:
Octol1ttle 2026-01-21 16:11:25 +05:00 • committed by Trial97
parent 0baca3fbea
commit b88c2b109d
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
1 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
launcher/minecraft/MinecraftInstance.cpp
View file

@ -685,12 +685,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;
}
@ -1004,7 +999,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()) {