CodeMirror/VRCMelonAssistant
1
0
Fork 0
mirror of https://github.com/knah/VRCMelonAssistant.git synced 2024-05-17 10:52:16 +12:00
Code Issues Projects Releases Wiki Activity

Merge pull request #189 from Rychard/verify-resource-before-access

Browse source 
Don't attempt to access non-existent manifest resources
This commit is contained in:
Assistant 2020-06-08 20:29:45 -06:00 committed by GitHub
parent 869802f59d affa4aa6ff
commit 1fd55d9df6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ModAssistant/Classes/Themes.cs
View file

@ -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);