mirror of
https://github.com/knah/VRCMelonAssistant.git
synced 2024-06-01 18:20:12 +12:00
Merge pull request #189 from Rychard/verify-resource-before-access
Don't attempt to access non-existent manifest resources
This commit is contained in:
commit
1fd55d9df6
|
@ -433,9 +433,19 @@ namespace ModAssistant
|
||||||
|
|
||||||
private static BitmapImage GetImageFromEmbeddedResources(string themeName, string imageName)
|
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
|
try
|
||||||
{
|
{
|
||||||
using (Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream($"ModAssistant.Themes.{themeName}.{imageName}.png"))
|
using (Stream stream = assembly.GetManifestResourceStream(desiredResourceName))
|
||||||
{
|
{
|
||||||
byte[] imageBytes = new byte[stream.Length];
|
byte[] imageBytes = new byte[stream.Length];
|
||||||
stream.Read(imageBytes, 0, (int)stream.Length);
|
stream.Read(imageBytes, 0, (int)stream.Length);
|
||||||
|
|
Loading…
Reference in a new issue