2 files changed, 21 insertions, 1 deletions
diff --git a/launcher/ui/InstanceWindow.cpp b/launcher/ui/InstanceWindow.cpp
index 5bf42bb5..09ce0d67 100644
--- a/launcher/ui/InstanceWindow.cpp
+++ b/launcher/ui/InstanceWindow.cpp
@@ -166,7 +166,13 @@ void InstanceWindow::updateLaunchButtons()
     else
     {
         m_launchOfflineButton->setEnabled(true);
-        m_launchDemoButton->setEnabled(true);
+
+        // Disable demo-mode if not available.
+        auto instance = dynamic_cast<MinecraftInstance*>(m_instance.get());
+        if (instance) {
+            m_launchDemoButton->setEnabled(instance->supportsDemo());
+        }
+
         m_killButton->setText(tr("Launch"));
         m_killButton->setObjectName("launchButton");
         m_killButton->setToolTip(tr("Launch the instance"));
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 9b195d26..58b1ae80 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1253,6 +1253,13 @@ void MainWindow::updateToolsMenu()
         normalLaunchOffline->setDisabled(true);
         normalLaunchDemo->setDisabled(true);
     }
+
+    // Disable demo-mode if not available.
+    auto instance = dynamic_cast<MinecraftInstance*>(m_selectedInstance.get());
+    if (instance) {
+        normalLaunchDemo->setEnabled(instance->supportsDemo());
+    }
+
     QString profilersTitle = tr("Profilers");
     launchMenu->addSeparator()->setText(profilersTitle);
     launchOfflineMenu->addSeparator()->setText(profilersTitle);
@@ -2164,6 +2171,13 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
         ui->actionLaunchInstance->setEnabled(m_selectedInstance->canLaunch());
         ui->actionLaunchInstanceOffline->setEnabled(m_selectedInstance->canLaunch());
         ui->actionLaunchInstanceDemo->setEnabled(m_selectedInstance->canLaunch());
+
+        // Disable demo-mode if not available.
+        auto instance = dynamic_cast<MinecraftInstance*>(m_selectedInstance.get());
+        if (instance) {
+             ui->actionLaunchInstanceDemo->setEnabled(instance->supportsDemo());
+        }
+
         ui->actionKillInstance->setEnabled(m_selectedInstance->isRunning());
         ui->actionExportInstance->setEnabled(m_selectedInstance->canExport());
         ui->renameButton->setText(m_selectedInstance->name());