diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 1fcf8a0fe1..0d1d2ef099 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -871,7 +871,7 @@ class ReaderActivity : BaseActivity() { * the viewer is reaching the beginning or end of a chapter or the transition page is active. */ fun requestPreloadChapter(chapter: ReaderChapter) { - lifecycleScope.launch { viewModel.preloadChapter(chapter) } + lifecycleScope.launchIO { viewModel.preloadChapter(chapter) } } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt index 3498f17456..23a87204e2 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderViewModel.kt @@ -388,20 +388,17 @@ class ReaderViewModel( return } - logcat { "Preloading ${chapter.chapter.url}" } - val loader = loader ?: return - withIOContext { - try { - loader.loadChapter(chapter) - } catch (e: Throwable) { - if (e is CancellationException) { - throw e - } - return@withIOContext + try { + logcat { "Preloading ${chapter.chapter.url}" } + loader.loadChapter(chapter) + } catch (e: Throwable) { + if (e is CancellationException) { + throw e } - eventChannel.trySend(Event.ReloadViewerChapters) + return } + eventChannel.trySend(Event.ReloadViewerChapters) } /**