From 9b32d12b3a1957c8139c868109ceaf1653733cc2 Mon Sep 17 00:00:00 2001 From: arkon Date: Wed, 8 Feb 2023 21:35:59 -0500 Subject: [PATCH] Prioritize finding selected chapter when deduping reader chapters Fixes #9054 (cherry picked from commit 23432e44050cd8638f070745edf77be75aeffe21) (cherry picked from commit 255eda6d8eff79efca2e892efea89e40be58a79f) --- .../java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 aaba7b699..ed2c6f5f4 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 @@ -216,10 +216,11 @@ class ReaderViewModel( }.run { if (readerPreferences.skipDupe().get()) { groupBy { it.chapterNumber } - .mapValues { (_, chapters) -> - chapters.find { it.id == chapterId || it.scanlator == selectedChapter.scanlator } ?: chapters.first() + .map { (_, chapters) -> + chapters.find { it.id == selectedChapter.id } + ?: chapters.find { it.scanlator == selectedChapter.scanlator } + ?: chapters.first() } - .values } else { this }