CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #451 from Scrumplex/fix-modloader-selection

Browse Source
This commit is contained in:
dada513 2022-04-19 21:01:43 +02:00 committed by GitHub
commit b9d5e1bbf1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
launcher/InstanceCreationTask.cpp
View File

@ -31,7 +31,7 @@ void InstanceCreationTask::executeTask()
components->buildingFromScratch(); components->buildingFromScratch();
components->setComponentVersion("net.minecraft", m_version->descriptor(), true); components->setComponentVersion("net.minecraft", m_version->descriptor(), true);
if(m_usingLoader) if(m_usingLoader)
components->setComponentVersion(m_loader, m_loaderVersion->descriptor(), true); components->setComponentVersion(m_loader, m_loaderVersion->descriptor());
inst.setName(m_instName); inst.setName(m_instName);
inst.setIconKey(m_instIcon); inst.setIconKey(m_instIcon);
instanceSettings->resumeSave(); instanceSettings->resumeSave();

5
launcher/ui/pages/modplatform/VanillaPage.cpp
View File

@ -158,7 +158,6 @@ void VanillaPage::loaderFilterChanged()
auto vlist = APPLICATION->metadataIndex()->get(m_selectedLoader); auto vlist = APPLICATION->metadataIndex()->get(m_selectedLoader);
ui->loaderVersionList->initialize(vlist.get()); ui->loaderVersionList->initialize(vlist.get());
ui->loaderVersionList->selectRecommended(); ui->loaderVersionList->selectRecommended();
suggestCurrent();
ui->loaderVersionList->setEmptyString(tr("No versions are currently available for Minecraft %1").arg(minecraftVersion)); ui->loaderVersionList->setEmptyString(tr("No versions are currently available for Minecraft %1").arg(minecraftVersion));
} }
@ -205,8 +204,8 @@ void VanillaPage::suggestCurrent()
return; return;
} }
// List is empty if either no mod loader is selected, or no versions are available // There isn't a selected version if the version list is empty
if(!ui->loaderVersionList->hasVersions()) if(ui->loaderVersionList->selectedVersion() == nullptr)
dialog->setSuggestedPack(m_selectedVersion->descriptor(), new InstanceCreationTask(m_selectedVersion)); dialog->setSuggestedPack(m_selectedVersion->descriptor(), new InstanceCreationTask(m_selectedVersion));
else else
{ {