From b7561184ea7bfafc9053f354367421fbe8526bae Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Tue, 29 Nov 2022 20:12:24 -0500 Subject: [PATCH] Fix navigating out when all migrations are done or skipped --- .../advanced/process/MigrationListScreenModel.kt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreenModel.kt index 0a9f112dc..8b7abdd4c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreenModel.kt @@ -274,13 +274,16 @@ class MigrationListScreenModel( } } - private fun sourceFinished() { + private suspend fun sourceFinished() { unfinishedCount.value = migratingItems.value.count { it.searchResult.value != SearchResult.Searching } if (allMangasDone()) { migrationDone.value = true } + if (migratingItems.value.isEmpty()) { + navigateOut() + } } fun allMangasDone() = migratingItems.value.all { it.searchResult.value != SearchResult.Searching } && @@ -481,12 +484,6 @@ class MigrationListScreenModel( coroutineScope.launchIO { val item = migratingItems.value.find { it.manga.id == mangaId } ?: return@launchIO - if (migratingItems.value.size == 1) { - item.searchResult.value = SearchResult.NotFound - item.migrationScope.cancel() - sourceFinished() - return@launchIO - } removeManga(item) item.migrationScope.cancel() sourceFinished()