diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt index efdc8e5046..db74f498c7 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt @@ -47,6 +47,7 @@ class ChapterLoader( } } .observeOn(AndroidSchedulers.mainThread()) + .doOnError { chapter.state = ReaderChapter.State.Error(it) } .doOnNext { pages -> if (pages.isEmpty()) { throw Exception(context.getString(R.string.page_list_empty_error)) @@ -61,7 +62,6 @@ class ChapterLoader( } } .toCompletable() - .doOnError { chapter.state = ReaderChapter.State.Error(it) } } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt index 3789bef34a..cdbe67d7a1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt @@ -87,7 +87,6 @@ class HttpPageLoader( override fun getPages(): Observable> { return Observable.fromCallable { chapterCache.getPageListFromCache(chapter.chapter) } .onErrorResumeNext { source.fetchPageList(chapter.chapter) } - .onErrorReturn { emptyList() } .map { pages -> pages.mapIndexed { index, page -> // Don't trust sources and use our own indexing