diff options
| author | Sky <git@bunnies.cc> | 2013-11-06 01:18:47 +0000 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2013-11-06 01:18:47 +0000 |
| commit | dd6af4efab11b0c1c4344bcb780abf1701b51511 (patch) | |
| tree | 39ca5c83ff7e0aad9bbdfdae634d75ed811b7d4b /gui | |
| parent | 51dee3745f044e413797eb5ea3f8260d1ff6935b (diff) | |
| download | MultiMC-dd6af4efab11b0c1c4344bcb780abf1701b51511.tar MultiMC-dd6af4efab11b0c1c4344bcb780abf1701b51511.tar.gz MultiMC-dd6af4efab11b0c1c4344bcb780abf1701b51511.tar.lz MultiMC-dd6af4efab11b0c1c4344bcb780abf1701b51511.tar.xz MultiMC-dd6af4efab11b0c1c4344bcb780abf1701b51511.zip | |
Nag for instance specific JVM args too
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/MainWindow.cpp | 4 | ||||
| -rw-r--r-- | gui/dialogs/InstanceSettings.cpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/gui/MainWindow.cpp b/gui/MainWindow.cpp index cf4a7124..62ae195b 100644 --- a/gui/MainWindow.cpp +++ b/gui/MainWindow.cpp @@ -535,7 +535,7 @@ void MainWindow::instanceActivated(QModelIndex index) BaseInstance *inst = (BaseInstance *)index.data(InstanceList::InstancePointerRole).value<void *>(); - NagUtils::checkJVMArgs(MMC->settings()->get("JvmArgs").toString(), this); + NagUtils::checkJVMArgs(inst->settings().get("JvmArgs").toString(), this); bool autoLogin = inst->settings().get("AutoLogin").toBool(); if (autoLogin) @@ -548,7 +548,7 @@ void MainWindow::on_actionLaunchInstance_triggered() { if (m_selectedInstance) { - NagUtils::checkJVMArgs(MMC->settings()->get("JvmArgs").toString(), this); + NagUtils::checkJVMArgs(m_selectedInstance->settings().get("JvmArgs").toString(), this); doLogin(); } } diff --git a/gui/dialogs/InstanceSettings.cpp b/gui/dialogs/InstanceSettings.cpp index a3269878..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) @@ -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 { |