diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BaseCoroutinePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BaseCoroutinePresenter.kt index cf5926557f..6a9515583f 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BaseCoroutinePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/base/presenter/BaseCoroutinePresenter.kt @@ -7,8 +7,7 @@ import kotlinx.coroutines.cancel import java.lang.ref.WeakReference open class BaseCoroutinePresenter { - lateinit var presenterScope: CoroutineScope - val isScopeInitialized get() = this::presenterScope.isInitialized + var presenterScope = CoroutineScope(SupervisorJob() + Dispatchers.Default) private var weakView: WeakReference? = null protected val view: T? get() = weakView?.get() @@ -23,9 +22,6 @@ open class BaseCoroutinePresenter { } open fun onCreate() { - if (!isScopeInitialized) { - presenterScope = CoroutineScope(SupervisorJob() + Dispatchers.Default) - } } open fun onDestroy() { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt index f694019d86..86463c78e5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsController.kt @@ -615,7 +615,7 @@ class MangaDetailsController : //region Lifecycle methods override fun onActivityResumed(activity: Activity) { super.onActivityResumed(activity) - if (presenter.isScopeInitialized) { + if (adapter != null) { presenter.isLockedFromSearch = shouldLockIfNeeded && SecureActivityDelegate.shouldBeLocked() presenter.headerItem.isLocked = presenter.isLockedFromSearch