NOISSUE add option to open global settings from instance settings

This should hopefully giude people towards using the right thing.

1 files changed, 8 insertions, 0 deletions

diff --git a/application/pages/instance/InstanceSettingsPage.cpp b/application/pages/instance/InstanceSettingsPage.cpp
index 61911f67..210820fc 100644
--- a/application/pages/instance/InstanceSettingsPage.cpp
+++ b/application/pages/instance/InstanceSettingsPage.cpp
@@ -21,6 +21,9 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
     ui->setupUi(this);
     auto sysMB = Sys::getSystemRam() / Sys::megabyte;
     ui->maxMemSpinBox->setMaximum(sysMB);
+    connect(ui->openGlobalJavaSettingsButton, &QCommandLinkButton::clicked, this, &InstanceSettingsPage::globalSettingsButtonClicked);
+    connect(MMC, &MultiMC::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings);
+    connect(MMC, &MultiMC::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
     loadSettings();
 }
 
@@ -34,6 +37,11 @@ InstanceSettingsPage::~InstanceSettingsPage()
     delete ui;
 }
 
+void InstanceSettingsPage::globalSettingsButtonClicked(bool)
+{
+    MMC->ShowGlobalSettings(this, "global-settings");
+}
+
 bool InstanceSettingsPage::apply()
 {
     applySettings();