diff --git a/SukiUI/Utilities/Effects/SukiEffect.cs b/SukiUI/Utilities/Effects/SukiEffect.cs index 834b97eab..622140413 100644 --- a/SukiUI/Utilities/Effects/SukiEffect.cs +++ b/SukiUI/Utilities/Effects/SukiEffect.cs @@ -68,9 +68,22 @@ public static SukiEffect FromEmbeddedResource(string shaderName) shaderName = shaderName.ToLowerInvariant(); if (!shaderName.EndsWith(".sksl")) shaderName += ".sksl"; - var assembly = Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly(); - var resName = assembly.GetManifestResourceNames() + + + + var assembly = Assembly.GetEntryAssembly(); + 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.");