From 0d8c5df795bf5329369676cc323bb165cefb0903 Mon Sep 17 00:00:00 2001
From: HapeLee <63206378+HapeLee@users.noreply.github.com>
Date: Sat, 20 Jun 2026 00:25:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B8=85=E7=90=86=E5=AD=97=E4=BD=93?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E5=86=97=E4=BD=99=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/legado/app/ui/book/read/ReadBookScreen.kt  | 6 +++---
 .../app/ui/config/themeConfig/ThemeConfigViewModel.kt       | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookScreen.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookScreen.kt
index 795c93f4f..cc89c5049 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookScreen.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookScreen.kt
@@ -444,16 +444,16 @@ fun ReadBookScreen(
         }
 
         is ReadBookSheet.ChangeBookSource -> {
-            val changeSourceSheet = state.activeSheet as? ReadBookSheet.ChangeBookSource
+            val changeSourceSheet = state.activeSheet
             val changeSourceBook = state.book
-            if (changeSourceSheet != null && changeSourceBook == null) {
+            if (changeSourceBook == null) {
                 LaunchedEffect(changeSourceSheet) {
                     onIntent(ReadBookIntent.DismissSheet)
                 }
             }
             if (changeSourceBook != null) {
                 ChangeSourceSheet(
-                    show = changeSourceSheet != null,
+                    show = true,
                     oldBook = changeSourceBook,
                     fromReadBookActivity = true,
                     allowAddAsNew = false,
diff --git a/app/src/main/java/io/legado/app/ui/config/themeConfig/ThemeConfigViewModel.kt b/app/src/main/java/io/legado/app/ui/config/themeConfig/ThemeConfigViewModel.kt
index 09ddd571c..27d8d7646 100644
--- a/app/src/main/java/io/legado/app/ui/config/themeConfig/ThemeConfigViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/config/themeConfig/ThemeConfigViewModel.kt
@@ -28,7 +28,10 @@ class ThemeConfigViewModel(
 ) : ViewModel() {
 
     val fontFolder = readSettingsRepository.preferences
-        .map { it.fontFolder as String? }
+        .map { preferences ->
+            val fontFolder: String? = preferences.fontFolder
+            fontFolder
+        }
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), null)
 
     fun setFontFolder(path: String) {