summaryrefslogtreecommitdiffstats
path: root/gui/settingsdialog.cpp
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-11-03 15:20:26 +0000
committerSky <git@bunnies.cc>2013-11-03 15:20:26 +0000
commitbade253a1a9a80a8f2c91f9a102caaf00032c7ce (patch)
tree9d471dc2b1c00a41ad491e61277a7eb4fbed0364 /gui/settingsdialog.cpp
parent09dc35688398b2dde41817828c4c657143506d3b (diff)
downloadMultiMC-bade253a1a9a80a8f2c91f9a102caaf00032c7ce.tar
MultiMC-bade253a1a9a80a8f2c91f9a102caaf00032c7ce.tar.gz
MultiMC-bade253a1a9a80a8f2c91f9a102caaf00032c7ce.tar.lz
MultiMC-bade253a1a9a80a8f2c91f9a102caaf00032c7ce.tar.xz
MultiMC-bade253a1a9a80a8f2c91f9a102caaf00032c7ce.zip
Added NagUtils, nag people about trying to override JVM memory options
Diffstat (limited to 'gui/settingsdialog.cpp')
-rw-r--r--gui/settingsdialog.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp
index 346f7414..703ade31 100644
--- a/gui/settingsdialog.cpp
+++ b/gui/settingsdialog.cpp
@@ -17,6 +17,7 @@
#include "settingsdialog.h"
#include "ui_settingsdialog.h"
#include "logic/JavaUtils.h"
+#include "logic/NagUtils.h"
#include "gui/versionselectdialog.h"
#include "gui/platform.h"
#include "gui/CustomMessageBox.h"
@@ -159,6 +160,7 @@ void SettingsDialog::applySettings(SettingsObject *s)
// Java Settings
s->set("JavaPath", ui->javaPathTextBox->text());
s->set("JvmArgs", ui->jvmArgsTextBox->text());
+ NagUtils::checkJVMArgs(s->get("JvmArgs").toString(), this->parentWidget());
// Custom Commands
s->set("PreLaunchCommand", ui->preLaunchCmdTextBox->text());