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

Fix for modlist images not clearing if N/A

Browse Source
This commit is contained in:
Justin Swanson 2019-12-14 14:33:26 -06:00
parent 078b457857
commit dee09f17d4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Wabbajack/View Models/Installers/InstallerVM.cs
View File

@ -219,8 +219,8 @@ namespace Wabbajack
_image = Observable.CombineLatest(
this.WhenAny(x => x.ModList.Error),
this.WhenAny(x => x.ModList)
.SelectMany(x => x?.ImageObservable ?? Observable.Empty<BitmapImage>())
.NotNull()
.Select(x => x?.ImageObservable ?? Observable.Empty<BitmapImage>())
.Switch()
.StartWith(WabbajackLogo),
this.WhenAny(x => x.Slideshow.Image)
.StartWith(default(BitmapImage)),
@ -231,7 +231,8 @@ namespace Wabbajack
{
return WabbajackErrLogo;
}
return installing ? slideshow : modList;
var ret = installing ? slideshow : modList;
return ret ?? WabbajackLogo;
})
.Select<BitmapImage, ImageSource>(x => x)
.ToProperty(this, nameof(Image));