From bade253a1a9a80a8f2c91f9a102caaf00032c7ce Mon Sep 17 00:00:00 2001
From: Sky <git@bunnies.cc>
Date: Sun, 3 Nov 2013 15:20:26 +0000
Subject: Added NagUtils, nag people about trying to override JVM memory
 options

---
 gui/mainwindow.cpp     | 5 +++++
 gui/settingsdialog.cpp | 2 ++
 2 files changed, 7 insertions(+)

(limited to 'gui')

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 00cfacf7..316117b7 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -66,6 +66,7 @@
 #include "logic/OneSixAssets.h"
 #include "logic/OneSixUpdate.h"
 #include "logic/JavaUtils.h"
+#include "logic/NagUtils.h"
 
 #include "logic/LegacyInstance.h"
 
@@ -471,9 +472,12 @@ void MainWindow::instanceActivated(QModelIndex index)
 {
 	if (!index.isValid())
 		return;
+
 	BaseInstance *inst =
 		(BaseInstance *)index.data(InstanceList::InstancePointerRole).value<void *>();
 
+	NagUtils::checkJVMArgs(MMC->settings()->get("JvmArgs").toString(), this);
+
 	bool autoLogin = MMC->settings()->get("AutoLogin").toBool();
 	if (autoLogin)
 		doAutoLogin();
@@ -485,6 +489,7 @@ void MainWindow::on_actionLaunchInstance_triggered()
 {
 	if (m_selectedInstance)
 	{
+		NagUtils::checkJVMArgs(MMC->settings()->get("JvmArgs").toString(), this);
 		doLogin();
 	}
 }
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());
-- 
cgit v1.2.3