Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resource loading fixes

Browse Source
This commit is contained in:
Justin Swanson 2019-11-29 17:56:56 -06:00
parent 9357717291
commit 107527311d
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Wabbajack.Common/Utils.cs
View File

@ -719,7 +719,7 @@ namespace Wabbajack.Common
throw new Exception(msg);
}
public static Stream GetResourceStream(string name)
public static Stream GetEmbeddedResourceStream(string name)
{
return (from assembly in AppDomain.CurrentDomain.GetAssemblies()
where !assembly.IsDynamic

2
Wabbajack.Lib/ACompiler.cs
View File

@ -134,7 +134,7 @@ namespace Wabbajack.Lib
public void GenerateReport()
{
string css;
using (var cssStream = Utils.GetResourceStream("Wabbajack.Lib.css-min.css"))
using (var cssStream = Utils.GetEmbeddedResourceStream("Wabbajack.Lib.css-min.css"))
{
using (var reader = new StreamReader(cssStream))
{

2
Wabbajack.Lib/UI/UIUtils.cs
View File

@ -60,7 +60,7 @@ namespace Wabbajack.Lib
return null;
}
public static BitmapImage BitmapImageFromResource(string name) => BitmapImageFromStream(Utils.GetResourceStream(name));
public static BitmapImage BitmapImageFromResource(string name) => BitmapImageFromStream(System.Windows.Application.GetResourceStream(new Uri("pack://application:,,,/Wabbajack;component/" + name)).Stream);
public static BitmapImage BitmapImageFromStream(Stream stream)
{

2
Wabbajack/View Models/Compilers/CompilerVM.cs
View File

@ -96,7 +96,7 @@ namespace Wabbajack
.DistinctUntilChanged()
.Select(path =>
{
if (string.IsNullOrWhiteSpace(path)) return UIUtils.BitmapImageFromResource("Wabbajack.Resources.Wabba_Mouth.png");
if (string.IsNullOrWhiteSpace(path)) return UIUtils.BitmapImageFromResource("Resources/Wabba_Mouth_No_Text.png");
if (UIUtils.TryGetBitmapImageFromFile(path, out var image))
{
return image;