From 2b890c20577100e64004e4983cbda2467ba695df Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Wed, 22 Jan 2025 12:58:26 -0500
Subject: [PATCH] Minor improvements

---
 .../eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt     | 2 ++
 app/src/main/java/exh/md/MangaDexLoginActivity.kt             | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt
index bf8d10ff0a9e..091e03e32533 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/feed/FeedScreenModel.kt
@@ -23,6 +23,7 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.receiveAsFlow
@@ -77,6 +78,7 @@ open class FeedScreenModel(
         getFeedSavedSearchGlobal.subscribe()
             .distinctUntilChanged()
             .onEach {
+                sourceManager.isInitialized.first { it }
                 val items = getSourcesToGetFeed(it).map { (feed, savedSearch) ->
                     createCatalogueSearchItem(
                         feed = feed,
diff --git a/app/src/main/java/exh/md/MangaDexLoginActivity.kt b/app/src/main/java/exh/md/MangaDexLoginActivity.kt
index 8192a6a3bc1f..bc03bb3610a8 100644
--- a/app/src/main/java/exh/md/MangaDexLoginActivity.kt
+++ b/app/src/main/java/exh/md/MangaDexLoginActivity.kt
@@ -4,7 +4,9 @@ import android.net.Uri
 import androidx.lifecycle.lifecycleScope
 import eu.kanade.tachiyomi.ui.setting.track.BaseOAuthLoginActivity
 import exh.md.utils.MdUtil
+import kotlinx.coroutines.flow.first
 import tachiyomi.core.common.util.lang.launchIO
+import tachiyomi.domain.source.service.SourceManager
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
 
@@ -14,11 +16,13 @@ class MangaDexLoginActivity : BaseOAuthLoginActivity() {
         val code = data?.getQueryParameter("code")
         if (code != null) {
             lifecycleScope.launchIO {
+                Injekt.get<SourceManager>().isInitialized.first { it }
                 MdUtil.getEnabledMangaDex(Injekt.get())?.login(code)
                 returnToSettings()
             }
         } else {
             lifecycleScope.launchIO {
+                Injekt.get<SourceManager>().isInitialized.first { it }
                 MdUtil.getEnabledMangaDex(Injekt.get())?.logout()
                 returnToSettings()
             }