summaryrefslogtreecommitdiffstats
path: root/application/pages/InstanceSettingsPage.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-09-04 02:10:29 +0200
committerPetr Mrázek <peterix@gmail.com>2015-09-04 02:10:29 +0200
commitcd108fd02975eac3a3fed2fde26c58de5cbdaf1c (patch)
treec19f22573086901238b7feacd9b265d249195700 /application/pages/InstanceSettingsPage.cpp
parent151a0ca11ec658525e151b7130543a364c41a3e8 (diff)
downloadMultiMC-cd108fd02975eac3a3fed2fde26c58de5cbdaf1c.tar
MultiMC-cd108fd02975eac3a3fed2fde26c58de5cbdaf1c.tar.gz
MultiMC-cd108fd02975eac3a3fed2fde26c58de5cbdaf1c.tar.lz
MultiMC-cd108fd02975eac3a3fed2fde26c58de5cbdaf1c.tar.xz
MultiMC-cd108fd02975eac3a3fed2fde26c58de5cbdaf1c.zip
GH-1223 fix override settings
They now work more like passthrough settings, except not passing through set and reset
Diffstat (limited to 'application/pages/InstanceSettingsPage.cpp')
-rw-r--r--application/pages/InstanceSettingsPage.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/application/pages/InstanceSettingsPage.cpp b/application/pages/InstanceSettingsPage.cpp
index 296de379..c651fcbd 100644
--- a/application/pages/InstanceSettingsPage.cpp
+++ b/application/pages/InstanceSettingsPage.cpp
@@ -119,11 +119,13 @@ void InstanceSettingsPage::applySettings()
if (custcmd)
{
m_settings->set("PreLaunchCommand", ui->preLaunchCmdTextBox->text());
+ m_settings->set("WrapperCommand", ui->preLaunchCmdTextBox->text());
m_settings->set("PostExitCommand", ui->postExitCmdTextBox->text());
}
else
{
m_settings->reset("PreLaunchCommand");
+ m_settings->reset("WrapperCommand");
m_settings->reset("PostExitCommand");
}
}
@@ -161,6 +163,7 @@ void InstanceSettingsPage::loadSettings()
// Custom Commands
ui->customCommandsGroupBox->setChecked(m_settings->get("OverrideCommands").toBool());
ui->preLaunchCmdTextBox->setText(m_settings->get("PreLaunchCommand").toString());
+ ui->wrapperCmdTextBox->setText(m_settings->get("WrapperCommand").toString());
ui->postExitCmdTextBox->setText(m_settings->get("PostExitCommand").toString());
}