From cc7b8a9b69e2bc3ec6bc3a80cc63248c6d12b5bb Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sat, 2 Mar 2024 13:41:35 -0500
Subject: [PATCH] Improve duplicate chapter set as read

---
 .../java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt | 8 +++++---
 1 file changed, 5 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 ef79c271e..e37870783 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
@@ -693,13 +693,15 @@ class ReaderViewModel @JvmOverloads constructor(
                 // SY <--
                 readerChapter.chapter.read = true
                 // SY -->
-                if (readerPreferences.markReadDupe().get()) {
+                if (readerChapter.chapter.chapter_number > 0 && readerPreferences.markReadDupe().get()) {
                     getChaptersByMangaId.await(manga!!.id).sortedByDescending { it.sourceOrder }
                         .filter { 
-                            !it.read && it.chapterNumber > 0.0 &&
+                            it.id != readerChapter.chapter.id &&
+                                !it.read &&
                                 it.chapterNumber.toFloat() == readerChapter.chapter.chapter_number
                         }
-                        .also { setReadStatus.await(true, *it.toTypedArray()) }
+                        .ifEmpty { null }
+                        ?.also { setReadStatus.await(true, *it.toTypedArray()) }
                 }
                 if (manga?.isEhBasedManga() == true) {
                     viewModelScope.launchNonCancellable {