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

Fixed custom banner not being included in output

Browse Source
This commit is contained in:
erri120 2019-10-07 19:16:27 +02:00
parent 28ea1ef140
commit 4560d7b8e6
No known key found for this signature in database
GPG Key ID: A8C0A18D8D4D3135
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Wabbajack/AppState.cs
View File

@ -490,7 +490,7 @@ namespace Wabbajack
ModListName = ChangedProperties ? SplashScreenModName : null, ModListName = ChangedProperties ? SplashScreenModName : null,
ModListAuthor = ChangedProperties ? SplashScreenAuthorName : null, ModListAuthor = ChangedProperties ? SplashScreenAuthorName : null,
ModListDescription = ChangedProperties ? SplashScreenSummary : null, ModListDescription = ChangedProperties ? SplashScreenSummary : null,
ModListImage = ChangedProperties ? newImagePath : null, ModListImage = ChangedProperties ? newImagePath ?? null : null,
ModListWebsite = ChangedProperties ? _nexusSiteURL : null ModListWebsite = ChangedProperties ? _nexusSiteURL : null
}; };
var th = new Thread(() => var th = new Thread(() =>

5
Wabbajack/Compiler.cs
View File

@ -277,6 +277,8 @@ namespace Wabbajack
GatherArchives(); GatherArchives();
BuildPatches(); BuildPatches();
if (File.Exists(ModListImage) && !File.Exists(Path.Combine(MO2ProfileDir, Path.GetFileName(ModListImage)))) File.Copy(ModListImage, Path.Combine(MO2ProfileDir, Path.GetFileName(ModListImage)));
ModList = new ModList ModList = new ModList
{ {
GameType = GameRegistry.Games.Values.First(f => f.MO2Name == MO2Ini.General.gameName).Game, GameType = GameRegistry.Games.Values.First(f => f.MO2Name == MO2Ini.General.gameName).Game,
@ -285,10 +287,9 @@ namespace Wabbajack
Name = ModListName ?? MO2Profile, Name = ModListName ?? MO2Profile,
Author = ModListAuthor ?? "", Author = ModListAuthor ?? "",
Description = ModListDescription ?? "", Description = ModListDescription ?? "",
Image = Path.GetFileName(ModListImage), Image = Path.Combine("profiles", MO2Profile, Path.GetFileName(ModListImage)),
Website = ModListWebsite ?? "" Website = ModListWebsite ?? ""
}; };
if(File.Exists(ModListImage)) File.Copy(ModListImage, Path.Combine(ModListOutputFolder, Path.GetFileName(ModListImage)));
ValidateModlist.RunValidation(ModList); ValidateModlist.RunValidation(ModList);

3
Wabbajack/ModlistPropertiesWindow.xaml.cs
View File

@ -53,8 +53,7 @@ namespace Wabbajack
{ {
if (newBannerFile != null) if (newBannerFile != null)
{ {
BitmapImage splashScreen = null; BitmapImage splashScreen = new BitmapImage(new Uri(newBannerFile));
splashScreen = new BitmapImage(new Uri(newBannerFile));
state.newImagePath = newBannerFile; state.newImagePath = newBannerFile;
state.SplashScreenImage = splashScreen; state.SplashScreenImage = splashScreen;
} }