From 212386f3ccac46a52666c2645afaa5e33f9f53b4 Mon Sep 17 00:00:00 2001
From: Jays2Kings <jays@outlook.com>
Date: Wed, 7 Apr 2021 04:01:12 -0400
Subject: [PATCH] Fix a few more endless loading issues

---
 .../tachiyomi/ui/recents/RecentsController.kt      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt
index 92a3bc9a24..ef65839f53 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt
@@ -312,7 +312,7 @@ class RecentsController(bundle: Bundle? = null) :
         if (!hasNewItems || presenter.viewType == RecentsPresenter.VIEW_TYPE_GROUP_ALL || presenter.query.isNotEmpty() ||
             recents.isEmpty()
         ) {
-            onAddPageError()
+            loadNoMore()
         } else if (hasNewItems && presenter.viewType != RecentsPresenter.VIEW_TYPE_GROUP_ALL && presenter.query.isEmpty()) {
             resetProgressItem()
         }
@@ -477,7 +477,7 @@ class RecentsController(bundle: Bundle? = null) :
             setOnQueryTextChangeListener(searchView) {
                 if (presenter.query != it) {
                     presenter.query = it ?: return@setOnQueryTextChangeListener false
-                    onAddPageError()
+                    loadNoMore()
                     refresh()
                 }
                 true
@@ -544,14 +544,18 @@ class RecentsController(bundle: Bundle? = null) :
 
     override fun onLoadMore(lastPosition: Int, currentPage: Int) {
         val view = view ?: return
-        if (presenter.finished || BackupRestoreService.isRunning(view.context.applicationContext)) {
-            onAddPageError()
+        if (presenter.finished ||
+            BackupRestoreService.isRunning(view.context.applicationContext) ||
+            presenter.viewType == RecentsPresenter.VIEW_TYPE_GROUP_ALL ||
+            presenter.query.isNotEmpty()
+        ) {
+            loadNoMore()
             return
         }
         presenter.requestNext()
     }
 
-    private fun onAddPageError() {
+    private fun loadNoMore() {
         adapter.onLoadMoreComplete(null)
     }