5 files changed, 25 insertions, 5 deletions
diff --git a/launcher/ui/dialogs/ModDownloadDialog.cpp b/launcher/ui/dialogs/ModDownloadDialog.cpp
index e4fc3ecc..bc5e5206 100644
--- a/launcher/ui/dialogs/ModDownloadDialog.cpp
+++ b/launcher/ui/dialogs/ModDownloadDialog.cpp
@@ -122,7 +122,7 @@ QList<BasePage *> ModDownloadDialog::getPages()
     QList<BasePage *> pages;
 
     pages.append(new ModrinthModPage(this, m_instance));
-    if (APPLICATION->currentCapabilities() & Application::SupportsFlame)
+    if (APPLICATION->capabilities() & Application::SupportsFlame)
         pages.append(new FlameModPage(this, m_instance));
 
     return pages;
diff --git a/launcher/ui/dialogs/NewInstanceDialog.cpp b/launcher/ui/dialogs/NewInstanceDialog.cpp
index 35bba9be..675f8b15 100644
--- a/launcher/ui/dialogs/NewInstanceDialog.cpp
+++ b/launcher/ui/dialogs/NewInstanceDialog.cpp
@@ -157,7 +157,7 @@ QList<BasePage *> NewInstanceDialog::getPages()
     pages.append(new VanillaPage(this));
     pages.append(importPage);
     pages.append(new AtlPage(this));
-    if (APPLICATION->currentCapabilities() & Application::SupportsFlame)
+    if (APPLICATION->capabilities() & Application::SupportsFlame)
         pages.append(new FlamePage(this));
     pages.append(new FtbPage(this));
     pages.append(new LegacyFTB::Page(this));
diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index fcc43add..a4f4dfb9 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -96,7 +96,7 @@ AccountListPage::AccountListPage(QWidget *parent)
     updateButtonStates();
 
     // Xbox authentication won't work without a client identifier, so disable the button if it is missing
-    if (~APPLICATION->currentCapabilities() & Application::SupportsMSA) {
+    if (~APPLICATION->capabilities() & Application::SupportsMSA) {
         ui->actionAddMicrosoft->setVisible(false);
         ui->actionAddMicrosoft->setToolTip(tr("No Microsoft Authentication client ID was set."));
     }
diff --git a/launcher/ui/pages/global/MinecraftPage.cpp b/launcher/ui/pages/global/MinecraftPage.cpp
index e3ac7e7c..cc597fe0 100644
--- a/launcher/ui/pages/global/MinecraftPage.cpp
+++ b/launcher/ui/pages/global/MinecraftPage.cpp
@@ -122,6 +122,16 @@ void MinecraftPage::loadSettings()
     ui->perfomanceGroupBox->setVisible(false);
 #endif
 
+    if (!(APPLICATION->capabilities() & Application::SupportsGameMode)) {
+        ui->enableFeralGamemodeCheck->setDisabled(true);
+        ui->enableFeralGamemodeCheck->setToolTip(tr("Feral Interactive's GameMode could not be found on your system."));
+    }
+
+    if (!(APPLICATION->capabilities() & Application::SupportsMangoHud)) {
+        ui->enableMangoHud->setDisabled(true);
+        ui->enableMangoHud->setToolTip(tr("MangoHud could not be found on your system."));
+    }
+
     ui->showGameTime->setChecked(s->get("ShowGameTime").toBool());
     ui->showGlobalGameTime->setChecked(s->get("ShowGlobalGameTime").toBool());
     ui->recordGameTime->setChecked(s->get("RecordGameTime").toBool());
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index f11cf992..03910745 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -348,9 +348,19 @@ void InstanceSettingsPage::loadSettings()
     ui->enableMangoHud->setChecked(m_settings->get("EnableMangoHud").toBool());
     ui->useDiscreteGpuCheck->setChecked(m_settings->get("UseDiscreteGpu").toBool());
 
-    #if !defined(Q_OS_LINUX)
+#if !defined(Q_OS_LINUX)
     ui->settingsTabs->setTabVisible(ui->settingsTabs->indexOf(ui->performancePage), false);
-    #endif
+#endif
+
+    if (!(APPLICATION->capabilities() & Application::SupportsGameMode)) {
+        ui->enableFeralGamemodeCheck->setDisabled(true);
+        ui->enableFeralGamemodeCheck->setToolTip(tr("Feral Interactive's GameMode could not be found on your system."));
+    }
+
+    if (!(APPLICATION->capabilities() & Application::SupportsMangoHud)) {
+        ui->enableMangoHud->setDisabled(true);
+        ui->enableMangoHud->setToolTip(tr("MangoHud could not be found on your system."));
+    }
 
     // Miscellanous
     ui->gameTimeGroupBox->setChecked(m_settings->get("OverrideGameTime").toBool());