fede/prismlauncher-crack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make column visibility global (#3748)

Browse Source
This commit is contained in:
Alexandru Ionut Tripon
2025-06-02 12:45:03 +03:00
committed by GitHub
parent d9b672ee8d 609a4f7160
commit 52fa074ff7
22 changed files with 187 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
launcher/minecraft/MinecraftInstance.cpp
View File

@@ -38,6 +38,7 @@
#include "MinecraftInstance.h"
#include "Application.h"
#include "BuildConfig.h"
#include "Json.h"
#include "QObjectPtr.h"
#include "minecraft/launch/AutoInstallJava.h"
#include "minecraft/launch/CreateGameFolders.h"
@@ -636,7 +637,8 @@ QProcessEnvironment MinecraftInstance::createEnvironment()
}
// custom env
auto insertEnv = [&env](QMap<QString, QVariant> envMap) {
auto insertEnv = [&env](QString value) {
auto envMap = Json::toMap(value);
if (envMap.isEmpty())
return;
@@ -647,9 +649,9 @@ QProcessEnvironment MinecraftInstance::createEnvironment()
bool overrideEnv = settings()->get("OverrideEnv").toBool();
if (!overrideEnv)
insertEnv(APPLICATION->settings()->get("Env").toMap());
insertEnv(APPLICATION->settings()->get("Env").toString());
else
insertEnv(settings()->get("Env").toMap());
insertEnv(settings()->get("Env").toString());
return env;
}