From c590f550303bfb9099a61023b940a1dd30a117fb Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Fri, 28 Apr 2023 10:11:13 -0400
Subject: [PATCH] Revert "Avoid potential crash when opening library settings
 sheet (#9415)"

This reverts commit 2cb08e6bb1244a9f5da097c1b5027209688b73c7.
---
 .../tachiyomi/ui/library/LibraryScreenModel.kt       |  7 ++-----
 .../eu/kanade/tachiyomi/ui/library/LibraryTab.kt     | 12 +++++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
index acc922e5cc..e5411fd842 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryScreenModel.kt
@@ -530,10 +530,7 @@ class LibraryScreenModel(
     }
 
     fun showSettingsDialog() {
-        mutableState.update {
-            val category = it.categories.getOrNull(activeCategoryIndex) ?: return@update it
-            it.copy(dialog = Dialog.SettingsSheet(category))
-        }
+        mutableState.update { it.copy(dialog = Dialog.SettingsSheet) }
     }
 
     fun clearSelection() {
@@ -654,7 +651,7 @@ class LibraryScreenModel(
     }
 
     sealed class Dialog {
-        data class SettingsSheet(val category: Category) : Dialog()
+        object SettingsSheet : Dialog()
         data class ChangeCategory(val manga: List<Manga>, val initialSelection: List<CheckboxState<Category>>) : Dialog()
         data class DeleteManga(val manga: List<Manga>) : Dialog()
     }
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
index f80ef07167..cdf60ae056 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt
@@ -205,13 +205,11 @@ object LibraryTab : Tab {
 
         val onDismissRequest = screenModel::closeDialog
         when (val dialog = state.dialog) {
-            is LibraryScreenModel.Dialog.SettingsSheet -> {
-                LibrarySettingsDialog(
-                    onDismissRequest = onDismissRequest,
-                    screenModel = settingsScreenModel,
-                    category = dialog.category,
-                )
-            }
+            is LibraryScreenModel.Dialog.SettingsSheet -> LibrarySettingsDialog(
+                onDismissRequest = onDismissRequest,
+                screenModel = settingsScreenModel,
+                category = state.categories[screenModel.activeCategoryIndex],
+            )
             is LibraryScreenModel.Dialog.ChangeCategory -> {
                 ChangeCategoryDialog(
                     initialSelection = dialog.initialSelection,