From 6af78418a45762a86ef1020d6e271de8a0b1285b Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Mon, 23 May 2016 12:10:24 +0200
Subject: [PATCH] Fix an issue with seamless mode and chapters with less than 5
 pages #291

---
 .../tachiyomi/ui/reader/viewer/base/BaseReader.kt   | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.kt
index 956f0bae79..fc147cb1c4 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/base/BaseReader.kt
@@ -94,14 +94,17 @@ abstract class BaseReader : BaseFragment() {
         if (readerActivity.presenter.isSeamlessMode) {
             val oldChapter = oldPage.chapter
             val newChapter = newPage.chapter
-            if (!hasRequestedNextChapter && position > pages.size - 5) {
+
+            // Active chapter has changed.
+            if (oldChapter.id != newChapter.id) {
+                readerActivity.onEnterChapter(newPage.chapter, newPage.pageNumber)
+            }
+            // Request next chapter only when the conditions are met.
+            if (pages.size - position < 5 && chapters.last().id == newChapter.id
+                    && readerActivity.presenter.hasNextChapter() && !hasRequestedNextChapter) {
                 hasRequestedNextChapter = true
                 readerActivity.presenter.appendNextChapter()
             }
-            if (oldChapter.id != newChapter.id) {
-                // Active chapter has changed.
-                readerActivity.onEnterChapter(newPage.chapter, newPage.pageNumber)
-            }
         }
         currentPage = position
         updatePageNumber()