From 80a5a54e6007d31a594be5c85f945fdcf7f1c877 Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Wed, 21 Apr 2021 17:38:46 -0400
Subject: [PATCH] Consider sort direction when resuming (fixes #4909)

(cherry picked from commit 8882cd4787040f76523d410e077497e6446a105e)

# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
---
 .../eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
index a620d0124..49cf6149d 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaPresenter.kt
@@ -891,10 +891,19 @@ class MangaPresenter(
      * Returns the next unread chapter or null if everything is read.
      */
     fun getNextUnreadChapter(): ChapterItem? {
+        val chapters = chapters.sortedWith(getChapterSort())
         return if (source.isEhBasedSource()) {
-            chapters.sortedWith(getChapterSort()).firstOrNull()?.takeUnless { it.read }
+            if (sortDescending()) {
+                chapters.firstOrNull()?.takeUnless { it.read }
+            } else {
+                chapters.lastOrNull()?.takeUnless { it.read }
+            }
         } else {
-            chapters.sortedWith(getChapterSort()).findLast { !it.read }
+            if (sortDescending()) {
+                return chapters.findLast { !it.read }
+            } else {
+                chapters.find { !it.read }
+            }
         }
     }