From affa4aa6ff820ba1664b36b8437efb80540df4d1 Mon Sep 17 00:00:00 2001 From: Joshua Shearer Date: Fri, 5 Jun 2020 10:20:01 -0400 Subject: [PATCH] Don't attempt to access non-existent manifest resources --- ModAssistant/Classes/Themes.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ModAssistant/Classes/Themes.cs b/ModAssistant/Classes/Themes.cs index 5e83996..846b61c 100644 --- a/ModAssistant/Classes/Themes.cs +++ b/ModAssistant/Classes/Themes.cs @@ -433,9 +433,19 @@ namespace ModAssistant private static BitmapImage GetImageFromEmbeddedResources(string themeName, string imageName) { + var assembly = Assembly.GetExecutingAssembly(); + var resourceNames = assembly.GetManifestResourceNames(); + var desiredResourceName = $"ModAssistant.Themes.{themeName}.{imageName}.png"; + + // Don't attempt to access non-existent manifest resources + if (!resourceNames.Contains(desiredResourceName)) + { + return null; + } + try { - using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream($"ModAssistant.Themes.{themeName}.{imageName}.png")) + using (Stream stream = assembly.GetManifestResourceStream(desiredResourceName)) { byte[] imageBytes = new byte[stream.Length]; stream.Read(imageBytes, 0, (int)stream.Length);