From c8446b8d65536913b62c4d4e83c22a2df798f8d9 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sat, 6 May 2023 18:42:25 -0400
Subject: [PATCH] Improve SourcePreferences error

---
 .../details/SourcePreferencesScreen.kt        | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesScreen.kt
index afb5a37bf..18d46e53a 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesScreen.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/extension/details/SourcePreferencesScreen.kt
@@ -141,17 +141,20 @@ class SourcePreferencesFragment : PreferenceFragmentCompat() {
     private fun populateScreen(): PreferenceScreen {
         val sourceId = requireArguments().getLong(SOURCE_ID)
         // SY -->
-        val source = Injekt.get<SourceManager>().get(sourceId)!!.let { source ->
-            if (source is EnhancedHttpSource) {
-                if (source.enhancedSource is ConfigurableSource) {
-                    source.source()
+        val source = Injekt.get<SourceManager>()
+            .get(sourceId)
+            ?.let { source ->
+                if (source is EnhancedHttpSource) {
+                    if (source.enhancedSource is ConfigurableSource) {
+                        source.source()
+                    } else {
+                        source.originalSource
+                    }
                 } else {
-                    source.originalSource
+                    source
                 }
-            } else {
-                source
             }
-        }
+            ?: throw NullPointerException("source = null, SOURCE_ID = $SOURCE_ID")
         // SY <--
 
         check(source is ConfigurableSource)