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

wait to load metadata

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-07-18 23:59:43 +03:00
parent 4c319c8f4f
commit f393aa684e
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
launcher/modplatform/flame/FlameInstanceCreationTask.cpp
View File

@ -255,17 +255,23 @@ bool FlameCreationTask::updateInstance()
return false;
}
QString FlameCreationTask::getVersionForLoader(QString uid, QString loaderType, QString version, QString mcVersion)
QString FlameCreationTask::getVersionForLoader(QString uid, QString loaderType, QString loaderVersion, QString mcVersion)
{
if (version == "recommended") {
if (loaderVersion == "recommended") {
auto vlist = APPLICATION->metadataIndex()->get(uid);
if (!vlist) {
setError(tr("Failed to get local metadata index for %1").arg(uid));
return Q_NULLPTR;
return {};
}
if (!vlist->isLoaded()) {
vlist->load(Net::Mode::Online);
QEventLoop loadVersionLoop;
auto task = vlist->getLoadTask();
connect(task.get(), &Task::finished, &loadVersionLoop, &QEventLoop::quit);
if (!task->isRunning())
task->start();
loadVersionLoop.exec();
}
for (int i = 0; i < vlist->versions().size(); i++) {
@ -289,15 +295,15 @@ QString FlameCreationTask::getVersionForLoader(QString uid, QString loaderType,
}
setError(tr("Failed to find version for %1 loader").arg(loaderType));
return Q_NULLPTR;
return {};
}
if (version == Q_NULLPTR || version.isEmpty()) {
if (loaderVersion.isEmpty()) {
emitFailed(tr("No loader version set for modpack!"));
return Q_NULLPTR;
return {};
}
return version;
return loaderVersion;
}
bool FlameCreationTask::createInstance()
@ -379,7 +385,7 @@ bool FlameCreationTask::createInstance()
components->setComponentVersion("net.minecraft", mcVersion, true);
if (!loaderType.isEmpty()) {
auto version = getVersionForLoader(loaderUid, loaderType, loaderVersion, mcVersion);
if (version == Q_NULLPTR || version.isEmpty())
if (version.isEmpty())
return false;
components->setComponentVersion(loaderUid, version);
}