From 96031869271b3c5ed43d3c7d227dcdcd584d9618 Mon Sep 17 00:00:00 2001 From: Jobobby04 Date: Tue, 26 Jan 2021 20:31:04 -0500 Subject: [PATCH] Fix reader bug with new suspend getFlatMetadata --- .../eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt index eb43ccb0c..4925acee8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt @@ -247,15 +247,12 @@ class ReaderPresenter( .first() .observeOn(AndroidSchedulers.mainThread()) // SY --> - .flatMap { manga -> + .map { manga -> val source = sourceManager.get(manga.source)?.getMainSource() if (manga.initialized && source is MetadataSource<*, *>) { - db.getFlatMetadataForManga(mangaId).asRxSingle().map { - manga to it?.raise(source.metaClass) - }.toObservable() - } else { - Observable.just(manga to null) - } + val flatMeta = db.getFlatMetadataForManga(mangaId).executeAsBlocking() + manga to flatMeta?.raise(source.metaClass) + } else manga to null } .doOnNext { init(it.first, initialChapterId, it.second) } // SY <--