mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-12-26 18:14:22 +00:00
Code Issues Projects Releases Wiki Activity

Nag for instance specific JVM args too

Browse Source
This commit is contained in:
Sky 2013-11-06 01:18:47 +00:00
parent 51dee3745f
commit dd6af4efab
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/MainWindow.cpp
View File

@ -535,7 +535,7 @@ void MainWindow::instanceActivated(QModelIndex index)
BaseInstance *inst = BaseInstance *inst =
(BaseInstance *)index.data(InstanceList::InstancePointerRole).value<void *>(); (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(); bool autoLogin = inst->settings().get("AutoLogin").toBool();
if (autoLogin) if (autoLogin)
@ -548,7 +548,7 @@ void MainWindow::on_actionLaunchInstance_triggered()
{ {
if (m_selectedInstance) if (m_selectedInstance)
{ {
NagUtils::checkJVMArgs(MMC->settings()->get("JvmArgs").toString(), this); NagUtils::checkJVMArgs(m_selectedInstance->settings().get("JvmArgs").toString(), this);
doLogin(); doLogin();
} }
} }

3
gui/dialogs/InstanceSettings.cpp
View File

@ -20,6 +20,7 @@
#include "InstanceSettings.h" #include "InstanceSettings.h"
#include "ui_InstanceSettings.h" #include "ui_InstanceSettings.h"
#include "gui/Platform.h" #include "gui/Platform.h"
#include "logic/NagUtils.h"
InstanceSettings::InstanceSettings(SettingsObject *obj, QWidget *parent) InstanceSettings::InstanceSettings(SettingsObject *obj, QWidget *parent)
: m_obj(obj), QDialog(parent), ui(new Ui::InstanceSettings) : 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("JavaPath", ui->javaPathTextBox->text());
m_obj->set("JvmArgs", ui->jvmArgsTextBox->text()); m_obj->set("JvmArgs", ui->jvmArgsTextBox->text());
NagUtils::checkJVMArgs(m_obj->get("JvmArgs").toString(), this->parentWidget());
} }
else else
{ {