copilot/komikku
1
0
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

fix crash if cancel migration too soon

Browse source
This commit is contained in:
Cuong-Tran 2024-10-29 16:59:37 +07:00
parent 55906548ee
commit dd0c3a516e
No known key found for this signature in database
GPG key ID: 733AA7624B9315C2
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigratingManga.kt
View file

@ -22,7 +22,7 @@ class MigratingManga(
val migrationScope = CoroutineScope(parentContext + SupervisorJob() + Dispatchers.Default)
// KMK -->
lateinit var searchingJob: Deferred<Manga?>
var searchingJob: Deferred<Manga?>? = null
// KMK <--
val searchResult = MutableStateFlow<SearchResult>(SearchResult.Searching)

5
app/src/main/java/eu/kanade/tachiyomi/ui/browse/migration/advanced/process/MigrationListScreenModel.kt
View file

@ -296,7 +296,7 @@ class MigrationListScreenModel(
}
}
// KMK -->
manga.searchingJob.await()
manga.searchingJob?.await()
// KMK <--
} catch (e: CancellationException) {
// Ignore canceled migrations
@ -571,7 +571,8 @@ class MigrationListScreenModel(
screenModelScope.launchIO {
val item = migratingItems.value.orEmpty().find { it.manga.id == mangaId }
?: return@launchIO
item.searchingJob.cancel()
item.searchingJob?.cancel()
item.searchingJob = null
item.searchResult.value = SearchResult.NotFound
sourceFinished()
}