From a2b7228e95f789d2437a4dd845292cbdc85f718f Mon Sep 17 00:00:00 2001
From: NerdNumber9 <nerd.number9@yandex.com>
Date: Tue, 30 Jul 2019 01:49:54 -0400
Subject: [PATCH] Fix infinite reloading after merging manga

---
 .../java/eu/kanade/tachiyomi/ui/manga/MangaController.kt   | 2 +-
 .../tachiyomi/ui/manga/chapter/ChaptersController.kt       | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
index 7e20146b0..822e7497c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt
@@ -83,7 +83,7 @@ class MangaController : RxController, TabbedController {
 
     val fromCatalogue = args.getBoolean(FROM_CATALOGUE_EXTRA, false)
 
-    val update = args.getBoolean(UPDATE_EXTRA, false)
+    var update = args.getBoolean(UPDATE_EXTRA, false)
 
     // EXH -->
     val smartSearchConfig: CatalogueController.SmartSearchConfig? = args.getParcelable(SMART_SEARCH_CONFIG_EXTRA)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
index 92eee93c7..d2a185c09 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/ChaptersController.kt
@@ -206,11 +206,14 @@ class ChaptersController : NucleusController<ChaptersPresenter>(),
         if (presenter.chapters.isEmpty())
             initialFetchChapters()
 
-        if ((parentController as MangaController).update
+        val mangaController = parentController as MangaController
+        if (mangaController.update
                 // Auto-update old format galleries
                 || ((presenter.manga.source == EH_SOURCE_ID || presenter.manga.source == EXH_SOURCE_ID)
-                        && chapters.size == 1 && chapters.first().date_upload == 0L))
+                        && chapters.size == 1 && chapters.first().date_upload == 0L)) {
+            mangaController.update = false
             fetchChaptersFromSource()
+        }
 
         val adapter = adapter ?: return
         adapter.updateDataSet(chapters)