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

ModVM and ModListVM utilize UIUtils to create images. Null fix

Browse Source
This commit is contained in:
Justin Swanson 2019-12-15 13:09:07 -06:00
parent 24f94d6bb7
commit 5db61d17ce
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,8 +18,10 @@ namespace Wabbajack.Lib
{
var img = new BitmapImage();
img.BeginInit();
img.CacheOption = BitmapCacheOption.OnLoad;
img.StreamSource = stream;
img.EndInit();
img.Freeze();
return img;
}

9
Wabbajack/View Models/ModListVM.cs
View File

@ -68,15 +68,10 @@ namespace Wabbajack
.ObserveOn(RxApp.MainThreadScheduler)
.Select(memStream =>
{
if (memStream == null) return default(BitmapImage);
try
{
var image = new BitmapImage();
image.BeginInit();
image.CacheOption = BitmapCacheOption.OnLoad;
image.StreamSource = memStream;
image.EndInit();
image.Freeze();
return image;
return UIUtils.BitmapImageFromStream(memStream);
}
catch (Exception ex)
{

8
Wabbajack/View Models/ModVM.cs
View File

@ -69,13 +69,7 @@ namespace Wabbajack
if (memStream == null) return default(BitmapImage);
try
{
var image = new BitmapImage();
image.BeginInit();
image.CacheOption = BitmapCacheOption.OnLoad;
image.StreamSource = memStream;
image.EndInit();
image.Freeze();
return image;
return UIUtils.BitmapImageFromStream(memStream);
}
catch (Exception ex)
{