diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-10-24 23:00:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-24 23:00:02 +0200 |
| commit | 08cd5d52fad56630ae607df13906497a9562d694 (patch) | |
| tree | 0ab38c2da856c6ee78624dfb2a07a0fc9e11e63d | |
| parent | d0e668e1d8e3b7260fea7d54ea10cc41ba7b812b (diff) | |
| parent | b638a6ae950e472c6e6139cfdbaa2950e848efb0 (diff) | |
| download | PrismLauncher-08cd5d52fad56630ae607df13906497a9562d694.tar.gz PrismLauncher-08cd5d52fad56630ae607df13906497a9562d694.tar.bz2 PrismLauncher-08cd5d52fad56630ae607df13906497a9562d694.zip | |
Merge pull request #283 from flowln/fix_abort_on_autosearch
| -rw-r--r-- | launcher/modplatform/helpers/NetworkModAPI.cpp | 1 | ||||
| -rw-r--r-- | launcher/ui/pages/modplatform/ModModel.cpp | 25 | ||||
| -rw-r--r-- | launcher/ui/pages/modplatform/ModModel.h | 1 |
3 files changed, 18 insertions, 9 deletions
diff --git a/launcher/modplatform/helpers/NetworkModAPI.cpp b/launcher/modplatform/helpers/NetworkModAPI.cpp index 866e7540..7633030e 100644 --- a/launcher/modplatform/helpers/NetworkModAPI.cpp +++ b/launcher/modplatform/helpers/NetworkModAPI.cpp @@ -15,6 +15,7 @@ void NetworkModAPI::searchMods(CallerType* caller, SearchArgs&& args) const QObject::connect(netJob, &NetJob::started, caller, [caller, netJob] { caller->setActiveJob(netJob); }); QObject::connect(netJob, &NetJob::failed, caller, &CallerType::searchRequestFailed); + QObject::connect(netJob, &NetJob::aborted, caller, &CallerType::searchRequestAborted); QObject::connect(netJob, &NetJob::succeeded, caller, [caller, response] { QJsonParseError parse_error{}; QJsonDocument doc = QJsonDocument::fromJson(*response, &parse_error); diff --git a/launcher/ui/pages/modplatform/ModModel.cpp b/launcher/ui/pages/modplatform/ModModel.cpp index 49766fa6..ed58eb32 100644 --- a/launcher/ui/pages/modplatform/ModModel.cpp +++ b/launcher/ui/pages/modplatform/ModModel.cpp @@ -267,18 +267,25 @@ void ListModel::searchRequestFailed(QString reason) .arg(m_parent->displayName()) .arg(tr("API version too old!\nPlease update %1!").arg(BuildConfig.LAUNCHER_DISPLAYNAME))); } + jobPtr.reset(); + searchState = Finished; +} - if (searchState == ResetRequested) { - beginResetModel(); - modpacks.clear(); - endResetModel(); +void ListModel::searchRequestAborted() +{ + if (searchState != ResetRequested) + qCritical() << "Search task in ModModel aborted by an unknown reason!"; - nextSearchOffset = 0; - performPaginatedSearch(); - } else { - searchState = Finished; - } + // Retry fetching + jobPtr.reset(); + + beginResetModel(); + modpacks.clear(); + endResetModel(); + + nextSearchOffset = 0; + performPaginatedSearch(); } void ListModel::infoRequestFinished(QJsonDocument& doc, ModPlatform::IndexedPack& pack, const QModelIndex& index) diff --git a/launcher/ui/pages/modplatform/ModModel.h b/launcher/ui/pages/modplatform/ModModel.h index a58c7c55..d2636d87 100644 --- a/launcher/ui/pages/modplatform/ModModel.h +++ b/launcher/ui/pages/modplatform/ModModel.h @@ -51,6 +51,7 @@ class ListModel : public QAbstractListModel { public slots: void searchRequestFinished(QJsonDocument& doc); void searchRequestFailed(QString reason); + void searchRequestAborted(); void infoRequestFinished(QJsonDocument& doc, ModPlatform::IndexedPack& pack, const QModelIndex& index); |