Fix NullReferenceException on Android at Startup

kikipoulet · Feb 17, 2025 · 3eb6742 · 3eb6742
1 parent 61cdf5f
commit 3eb6742
Showing 1 changed file with 3 additions and 9 deletions.
diff --git a/SukiUI/Utilities/Effects/SukiEffect.cs b/SukiUI/Utilities/Effects/SukiEffect.cs
@@ -68,19 +68,13 @@ public static SukiEffect FromEmbeddedResource(string shaderName)
             shaderName = shaderName.ToLowerInvariant();
             if (!shaderName.EndsWith(".sksl"))
                 shaderName += ".sksl";
-            var assembly = Assembly.GetEntryAssembly();
-            var resName = assembly!.GetManifestResourceNames()
+            var assembly = Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly();
+            var resName = assembly.GetManifestResourceNames()
                 .FirstOrDefault(x => x.ToLowerInvariant().Contains(shaderName));
-            if (resName is null)
-            {
-                assembly = Assembly.GetExecutingAssembly();
-                resName = assembly.GetManifestResourceNames()
-                    .FirstOrDefault(x => x.ToLowerInvariant().Contains(shaderName));
-            }
-
             if (resName is null)
                 throw new FileNotFoundException(
                     $"Unable to find a file with the name \"{shaderName}\" anywhere in the assembly.");
+
             using var tr = new StreamReader(assembly.GetManifestResourceStream(resName)!);
             return FromString(tr.ReadToEnd());
         }