diff options
| author | Andrew <forkk@forkk.net> | 2013-11-11 11:37:15 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-11-11 11:37:15 -0600 |
| commit | 950088bee5d66b3656ba9506d7e4f9b61def5f49 (patch) | |
| tree | 895e74767b71f5907d006ce01f47ea7d1e0f97ff /gui/dialogs/InstanceSettings.cpp | |
| parent | 5083a6a8090fa03d3c1800c1f9588079ca11e9f9 (diff) | |
| parent | e611aef0e77f727d0c77f6dea0d373e7a12b241c (diff) | |
| download | PrismLauncher-950088bee5d66b3656ba9506d7e4f9b61def5f49.tar.gz PrismLauncher-950088bee5d66b3656ba9506d7e4f9b61def5f49.tar.bz2 PrismLauncher-950088bee5d66b3656ba9506d7e4f9b61def5f49.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'gui/dialogs/InstanceSettings.cpp')
| -rw-r--r-- | gui/dialogs/InstanceSettings.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gui/dialogs/InstanceSettings.cpp b/gui/dialogs/InstanceSettings.cpp index 57dd6a81..add135b4 100644 --- a/gui/dialogs/InstanceSettings.cpp +++ b/gui/dialogs/InstanceSettings.cpp @@ -20,6 +20,7 @@ #include "InstanceSettings.h" #include "ui_InstanceSettings.h" #include "gui/Platform.h" +#include "logic/NagUtils.h" InstanceSettings::InstanceSettings(SettingsObject *obj, QWidget *parent) : m_obj(obj), QDialog(parent), ui(new Ui::InstanceSettings) @@ -89,11 +90,11 @@ void InstanceSettings::applySettings() } // Auto Login - bool login = ui->accountSettingsGroupBox->isChecked(); + bool login = ui->accountSettingsBox->isChecked(); m_obj->set("OverrideLogin", login); if (login) { - m_obj->set("AutoLogin", ui->autoLoginChecBox->isChecked()); + m_obj->set("AutoLogin", ui->autoLoginCheckBox->isChecked()); } else { @@ -123,6 +124,8 @@ void InstanceSettings::applySettings() { m_obj->set("JavaPath", ui->javaPathTextBox->text()); m_obj->set("JvmArgs", ui->jvmArgsTextBox->text()); + + NagUtils::checkJVMArgs(m_obj->get("JvmArgs").toString(), this->parentWidget()); } else { @@ -159,8 +162,8 @@ void InstanceSettings::loadSettings() ui->windowHeightSpinBox->setValue(m_obj->get("MinecraftWinHeight").toInt()); // Auto Login - ui->accountSettingsGroupBox->setChecked(m_obj->get("OverrideLogin").toBool()); - ui->autoLoginChecBox->setChecked(m_obj->get("AutoLogin").toBool()); + ui->accountSettingsBox->setChecked(m_obj->get("OverrideLogin").toBool()); + ui->autoLoginCheckBox->setChecked(m_obj->get("AutoLogin").toBool()); // Memory ui->memoryGroupBox->setChecked(m_obj->get("OverrideMemory").toBool()); |