From d385dfe8084396caa47212e54c65730b50ff9043 Mon Sep 17 00:00:00 2001 From: Cuong-Tran Date: Fri, 29 Aug 2025 18:10:55 +0700 Subject: [PATCH] fix(merged-chapters) Fix chapter's webview (#1116) * Fix chapter's webview * combine null check * variable name Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- .../java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt index 7c0de2124..32e32ff8f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt @@ -830,7 +830,13 @@ class ReaderViewModel @JvmOverloads constructor( fun getChapterUrl(): String? { val sChapter = getCurrentChapter()?.chapter ?: return null - val source = getSource() ?: return null + val source = if (manga?.source == MERGED_SOURCE_ID) { + state.value.mergedManga?.get(sChapter.manga_id)?.source?.let { sourceId -> + sourceManager.getOrStub(sourceId) as? HttpSource + } + } else { + getSource() + } ?: return null return try { source.getChapterUrl(sChapter)