Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop

2 files changed, 7 insertions, 4 deletions

diff --git a/launcher/ui/pages/modplatform/ResourcePage.cpp b/launcher/ui/pages/modplatform/ResourcePage.cpp
index 736034ad..1d2509d8 100644
--- a/launcher/ui/pages/modplatform/ResourcePage.cpp
+++ b/launcher/ui/pages/modplatform/ResourcePage.cpp
@@ -240,10 +240,13 @@ void ResourcePage::updateSelectionButton()
     }
 
     m_ui->resourceSelectionButton->setEnabled(true);
-    if (!getCurrentPack()->isVersionSelected(m_selected_version_index)) {
-        m_ui->resourceSelectionButton->setText(tr("Select %1 for download").arg(resourceString()));
+    if (getCurrentPack()) {
+        if (!getCurrentPack()->isVersionSelected(m_selected_version_index))
+            m_ui->resourceSelectionButton->setText(tr("Select %1 for download").arg(resourceString()));
+        else
+            m_ui->resourceSelectionButton->setText(tr("Deselect %1 for download").arg(resourceString()));
     } else {
-        m_ui->resourceSelectionButton->setText(tr("Deselect %1 for download").arg(resourceString()));
+        qWarning() << "Tried to update the selected button but there is not a pack selected";
     }
 }
 
diff --git a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
index f5f50cae..3d2d568a 100644
--- a/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
+++ b/launcher/ui/pages/modplatform/atlauncher/AtlUserInteractionSupportImpl.cpp
@@ -68,7 +68,7 @@ QString AtlUserInteractionSupportImpl::chooseVersion(Meta::VersionList::Ptr vlis
     // select recommended build
     for (int i = 0; i < vlist->versions().size(); i++) {
         auto version = vlist->versions().at(i);
-        auto reqs = version->requires();
+        auto reqs = version->requiredSet();
 
         // filter by minecraft version, if the loader depends on a certain version.
         if (minecraftVersion != nullptr) {