Prioritize finding selected chapter when deduping reader chapters

Fixes #9054 (cherry picked from commit 23432e4405)
2023-02-08 21:35:59 -05:00 · 2023-02-08 21:35:59 -05:00 · 5ef11e61d0
commit 5ef11e61d0
parent 48546c3db4
1 changed files with 4 additions and 3 deletions
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt
@ -177,10 +177,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
            }