1 files changed, 32 insertions, 0 deletions
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index b4562843..1d8cd1d7 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -50,6 +50,7 @@
 #include "Application.h"
 
 #include "java/JavaInstallList.h"
+#include "java/JavaUtils.h"
 #include "FileSystem.h"
 
 
@@ -232,6 +233,22 @@ void InstanceSettingsPage::applySettings()
         m_settings->reset("UseNativeGLFW");
     }
 
+    // Performance
+    bool performance = ui->perfomanceGroupBox->isChecked();
+    m_settings->set("OverridePerformance", performance);
+    if(performance)
+    {
+        m_settings->set("EnableFeralGamemode", ui->enableFeralGamemodeCheck->isChecked());
+        m_settings->set("EnableMangoHud", ui->enableMangoHud->isChecked());
+        m_settings->set("UseDiscreteGpu", ui->useDiscreteGpuCheck->isChecked());
+    }
+    else
+    {
+        m_settings->reset("EnableFeralGamemode");
+        m_settings->reset("EnableMangoHud");
+        m_settings->reset("UseDiscreteGpu");
+    }
+
     // Game time
     bool gameTime = ui->gameTimeGroupBox->isChecked();
     m_settings->set("OverrideGameTime", gameTime);
@@ -325,6 +342,16 @@ void InstanceSettingsPage::loadSettings()
     ui->useNativeGLFWCheck->setChecked(m_settings->get("UseNativeGLFW").toBool());
     ui->useNativeOpenALCheck->setChecked(m_settings->get("UseNativeOpenAL").toBool());
 
+    // Performance
+    ui->perfomanceGroupBox->setChecked(m_settings->get("OverridePerformance").toBool());
+    ui->enableFeralGamemodeCheck->setChecked(m_settings->get("EnableFeralGamemode").toBool());
+    ui->enableMangoHud->setChecked(m_settings->get("EnableMangoHud").toBool());
+    ui->useDiscreteGpuCheck->setChecked(m_settings->get("UseDiscreteGpu").toBool());
+
+    #if !defined(Q_OS_LINUX)
+    ui->perfomanceGroupBox->setVisible(false);
+    #endif
+
     // Miscellanous
     ui->gameTimeGroupBox->setChecked(m_settings->get("OverrideGameTime").toBool());
     ui->showGameTime->setChecked(m_settings->get("ShowGameTime").toBool());
@@ -336,6 +363,11 @@ void InstanceSettingsPage::loadSettings()
 
 void InstanceSettingsPage::on_javaDetectBtn_clicked()
 {
+    if (JavaUtils::getJavaCheckPath().isEmpty()) {
+        JavaCommon::javaCheckNotFound(this);
+        return;
+    }
+
     JavaInstallPtr java;
 
     VersionSelectDialog vselect(APPLICATION->javalist().get(), tr("Select a Java version"), this, true);