CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

made env vars behave like the rest of the settings

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2023-10-26 22:51:38 +03:00
parent e9fd02baca
commit 12d567a9b8
6 changed files with 17 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/ui/pages/global/EnvironmentVariablesPage.cpp
View File

@ -29,7 +29,7 @@ EnvironmentVariablesPage::EnvironmentVariablesPage(QWidget* parent) : QWidget(pa
variables->setContentsMargins(6, 6, 6, 6);
verticalLayout->addWidget(variables);
variables->initialize(false, true, false, APPLICATION->settings()->get("Env").toMap());
variables->initialize(false, false, APPLICATION->settings()->get("Env").toMap());
}
QString EnvironmentVariablesPage::displayName() const

12
launcher/ui/pages/instance/InstanceSettingsPage.cpp
View File

@ -203,9 +203,12 @@ void InstanceSettingsPage::applySettings()
}
// Environment Variables
m_settings->set("UseEnv", ui->environmentVariables->checked());
m_settings->set("OverrideEnv", ui->environmentVariables->override());
m_settings->set("Env", ui->environmentVariables->value());
auto env = ui->environmentVariables->override();
m_settings->set("OverrideEnv", env);
if (env)
m_settings->set("Env", ui->environmentVariables->value());
else
m_settings->reset("Env");
// Workarounds
bool workarounds = ui->nativeWorkaroundsGroupBox->isChecked();
@ -327,8 +330,7 @@ void InstanceSettingsPage::loadSettings()
m_settings->get("WrapperCommand").toString(), m_settings->get("PostExitCommand").toString());
// Environment variables
ui->environmentVariables->initialize(true, m_settings->get("UseEnv").toBool(), m_settings->get("OverrideEnv").toBool(),
m_settings->get("Env").toMap());
ui->environmentVariables->initialize(true, m_settings->get("OverrideEnv").toBool(), m_settings->get("Env").toMap());
// Workarounds
ui->nativeWorkaroundsGroupBox->setChecked(m_settings->get("OverrideNativeWorkarounds").toBool());