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

NOISSUE Fix edgecase where new searches won't be processed

2 files changed, 13 insertions, 19 deletions

diff --git a/application/pages/modplatform/ftb/FtbListModel.cpp b/application/pages/modplatform/ftb/FtbListModel.cpp
index 63236827..98973f2e 100644
--- a/application/pages/modplatform/ftb/FtbListModel.cpp
+++ b/application/pages/modplatform/ftb/FtbListModel.cpp
@@ -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()
diff --git a/application/pages/modplatform/ftb/FtbListModel.h b/application/pages/modplatform/ftb/FtbListModel.h
index 9c057d73..de94e6ba 100644
--- a/application/pages/modplatform/ftb/FtbListModel.h
+++ b/application/pages/modplatform/ftb/FtbListModel.h
@@ -57,7 +57,8 @@ private:
         None,
         CanPossiblyFetchMore,
         ResetRequested,
-        Finished
+        Finished,
+        Failed,
     } searchState = None;
     NetJobPtr jobPtr;
     int currentPack;