From 858134927a2cfb463c54626f467a51f1156f1b95 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Wed, 31 May 2023 21:38:52 +0800
Subject: [PATCH] Resolve #1122

---
 app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.kt | 4 ++--
 .../com/hippo/ehviewer/ui/legacy/GalleryInfoContentHelper.kt  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.kt b/app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.kt
index 195ae5b7c..71bdc903e 100644
--- a/app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.kt
+++ b/app/src/main/java/com/hippo/ehviewer/FavouriteStatusRouter.kt
@@ -34,8 +34,8 @@ class FavouriteStatusRouter {
         return id
     }
 
-    fun restoreDataMap(id: Int): MutableMap<Long, GalleryInfo> {
-        return maps.remove(id)!!
+    fun restoreDataMap(id: Int): MutableMap<Long, GalleryInfo>? {
+        return maps.remove(id)
     }
 
     fun modifyFavourites(gid: Long, slot: Int) {
diff --git a/app/src/main/java/com/hippo/ehviewer/ui/legacy/GalleryInfoContentHelper.kt b/app/src/main/java/com/hippo/ehviewer/ui/legacy/GalleryInfoContentHelper.kt
index 397c25520..acef310f8 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/legacy/GalleryInfoContentHelper.kt
+++ b/app/src/main/java/com/hippo/ehviewer/ui/legacy/GalleryInfoContentHelper.kt
@@ -77,8 +77,7 @@ abstract class GalleryInfoContentHelper : ContentHelper() {
         val id = bundle.getInt(KEY_DATA_MAP, IntIdGenerator.INVALID_ID)
         if (id != IntIdGenerator.INVALID_ID) {
             val router = EhApplication.favouriteStatusRouter
-            val map = router.restoreDataMap(id)
-            this.map = map
+            router.restoreDataMap(id)?.let { this.map = it }
         }
         return super.restoreInstanceState(state)
     }