aboutsummaryrefslogtreecommitdiff
path: root/launcher
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-03-20 17:46:09 +0100
committerGitHub <noreply@github.com>2022-03-20 17:46:09 +0100
commitf22cd0e8c74b64bf3797fbf380dbe0bd9bd461e8 (patch)
treec710543c04edddc460b51f6fa057c735a5cb3131 /launcher
parent8bc6cdf55c143313616aefe12a3c8bf7f0b67557 (diff)
parent702a1da0acb84013f1b6294cfab9cb78f7a23daf (diff)
downloadPrismLauncher-f22cd0e8c74b64bf3797fbf380dbe0bd9bd461e8.tar.gz
PrismLauncher-f22cd0e8c74b64bf3797fbf380dbe0bd9bd461e8.tar.bz2
PrismLauncher-f22cd0e8c74b64bf3797fbf380dbe0bd9bd461e8.zip
Merge pull request #316 from Scrumplex/fix-disabled-controls
Diffstat (limited to 'launcher')
-rw-r--r--launcher/ui/pages/instance/ModFolderPage.cpp5
-rw-r--r--launcher/ui/pages/instance/VersionPage.cpp2
2 files changed, 3 insertions, 4 deletions
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index ffb87bbe..c7a0376d 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -244,10 +244,7 @@ void ModFolderPage::on_RunningState_changed(bool running)
return;
}
m_controlsEnabled = !running;
- ui->actionAdd->setEnabled(m_controlsEnabled);
- ui->actionDisable->setEnabled(m_controlsEnabled);
- ui->actionEnable->setEnabled(m_controlsEnabled);
- ui->actionRemove->setEnabled(m_controlsEnabled);
+ ui->actionsToolbar->setEnabled(m_controlsEnabled);
}
bool ModFolderPage::shouldDisplay() const
diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp
index 0fa5f68d..43c449eb 100644
--- a/launcher/ui/pages/instance/VersionPage.cpp
+++ b/launcher/ui/pages/instance/VersionPage.cpp
@@ -212,6 +212,8 @@ void VersionPage::updateVersionControls()
// FIXME: this is a dirty hack
auto minecraftVersion = Version(m_profile->getComponentVersion("net.minecraft"));
+ ui->actionInstall_Forge->setEnabled(controlsEnabled);
+
bool supportsFabric = minecraftVersion >= Version("1.14");
ui->actionInstall_Fabric->setEnabled(controlsEnabled && supportsFabric);