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

Merge pull request #3690 from jamierocks/ftb-search-edge

Browse Source 
NOISSUE Fix edgecase where new searches won't be processed
This commit is contained in:
Petr Mrázek 2021-03-26 20:37:48 +00:00 committed by GitHub
commit 5400d4e613
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
application/pages/modplatform/ftb/FtbListModel.cpp
View File

@ -106,21 +106,22 @@ void ListModel::getLogo(const QString &logo, const QString &logoUrl, LogoCallbac
void ListModel::searchWithTerm(const QString &term)
{
if(currentSearchTerm == term && currentSearchTerm.isNull() == term.isNull()) {
if(searchState != Failed && currentSearchTerm == term && currentSearchTerm.isNull() == term.isNull()) {
// unless the search has failed, then there is no need to perform an identical search.
return;
}
currentSearchTerm = term;
if(jobPtr) {
jobPtr->abort();
searchState = ResetRequested;
return;
}
else {
beginResetModel();
modpacks.clear();
endResetModel();
searchState = None;
jobPtr.reset();
}
beginResetModel();
modpacks.clear();
endResetModel();
searchState = None;
performSearch();
}
@ -154,15 +155,7 @@ void ListModel::searchRequestFailed(QString reason)
jobPtr.reset();
remainingPacks.clear();
if(searchState == ResetRequested) {
beginResetModel();
modpacks.clear();
endResetModel();
performSearch();
} else {
searchState = Finished;
}
searchState = Failed;
}
void ListModel::requestPack()

3
application/pages/modplatform/ftb/FtbListModel.h
View File

@ -57,7 +57,8 @@ private:
None,
CanPossiblyFetchMore,
ResetRequested,
Finished
Finished,
Failed,
} searchState = None;
NetJobPtr jobPtr;
int currentPack;