From 1d0c76b2b2fb4f9a9b4dd534c29feaca11506e5c Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Tue, 26 Sep 2023 19:26:32 +0800
Subject: [PATCH] Fix OOB access when no results found

---
 .../java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
index ce7cb4b57..a5a89d91a 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.kt
@@ -515,14 +515,15 @@ class GalleryListScene : SearchBarScene() {
         tip: TextView,
     ) {
         val context = context ?: return
+        if (mAdapter!!.itemCount == 0) return
 
         // Can't add image search as quick search
         if (MODE_IMAGE_SEARCH == mUrlBuilder.mode) {
             showTip(R.string.image_search_not_quick_search, LENGTH_LONG)
             return
         }
-        val gi = mAdapter?.peek(binding.recyclerView.layoutManager!!.firstVisibleItemPosition)
-        val next = gi?.gid?.plus(1)
+        val gi = mAdapter!!.peek(binding.recyclerView.layoutManager!!.firstVisibleItemPosition)!!
+        val next = gi.gid + 1
 
         // Check duplicate
         for (q in mQuickSearchList) {
@@ -557,7 +558,7 @@ class GalleryListScene : SearchBarScene() {
                     }
                     return@launchIO
                 }
-                if (checked[0] && next != null) {
+                if (checked[0]) {
                     text += "@$next"
                     Settings.qSSaveProgress = true
                 } else {