From ba8ac27c707d1b9bca95ec2788fe4d2a8f6024aa Mon Sep 17 00:00:00 2001 From: zaghdaneh <46049558+zaghdaneh@users.noreply.github.com> Date: Thu, 13 Jul 2023 05:09:15 +0200 Subject: [PATCH] Fix to multiple chapter download incorrect state (#9707) add subscription to download manager queue state flow (cherry picked from commit 0fffde50fffd6a774a64634bb60ad0e08f469719) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt --- .../main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt index c3b63fd45..42703b975 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt @@ -292,7 +292,7 @@ class MangaInfoScreenModel( ) { state, mergedData -> state.copy(mergedData = mergedData) } - .combine(downloadCache.changes) { state, _ -> state } + .combine(downloadCache.changes, downloadManager.queueState) { state, _, _ -> state } // SY <-- .collectLatest { (manga, chapters /* SY --> */, flatMetadata, mergedData /* SY <-- */) -> val chapterItems = chapters.toChapterItems(manga /* SY --> */, mergedData /* SY <-- */)