dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Trial97 2023-12-13 14:48:31 +02:00
commit 763eab6b96
No known key found for this signature in database
GPG key ID: 55EF5DA53DB36318
46 changed files with 324 additions and 152 deletions
Download patch file Download diff file Expand all files Collapse all files

10
launcher/ui/pages/modplatform/ResourceModel.cpp
View file

@ -207,6 +207,10 @@ void ResourceModel::loadEntry(QModelIndex& entry)
return;
versionRequestSucceeded(doc, pack, entry);
};
if (!callbacks.on_fail)
callbacks.on_fail = [](QString reason, int) {
QMessageBox::critical(nullptr, tr("Error"), tr("A network error occurred. Could not load project versions:%1").arg(reason));
};
if (auto job = m_api->getProjectVersions(std::move(args), std::move(callbacks)); job)
runInfoJob(job);
@ -230,6 +234,12 @@ void ResourceModel::loadEntry(QModelIndex& entry)
return;
QMessageBox::critical(nullptr, tr("Error"), tr("A network error occurred. Could not load project info:%1").arg(reason));
};
if (!callbacks.on_abort)
callbacks.on_abort = [this] {
if (!s_running_models.constFind(this).value())
return;
qCritical() << tr("The request was abborted for an unknown reason");
};
if (auto job = m_api->getProjectInfo(std::move(args), std::move(callbacks)); job)
runInfoJob(job);