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

ISubInstallerVM.Compile returns bool now

Browse Source
This commit is contained in:
Justin Swanson 2020-01-18 15:57:53 -06:00
parent e2ebeb9af6
commit f1c0da3b4f
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Wabbajack/View Models/Installers/ISubInstallerVM.cs
View File

@ -18,6 +18,6 @@ namespace Wabbajack
void AfterInstallNavigation();
int ConfigVisualVerticalOffset { get; }
IObservable<bool> CanInstall { get; }
Task Install();
Task<bool> Install();
}
}

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

@ -364,8 +364,8 @@ namespace Wabbajack
{
try
{
await this.Installer.Install();
Completed = ErrorResponse.Success;
var success = await this.Installer.Install();
Completed = ErrorResponse.Create(success);
try
{
this.ModList?.OpenReadmeWindow();

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

@ -143,7 +143,7 @@ namespace Wabbajack
Process.Start("explorer.exe", Location.TargetPath);
}
public async Task Install()
public async Task<bool> Install()
{
using (var installer = new MO2Installer(
archive: Parent.ModListLocation.TargetPath,
@ -154,14 +154,13 @@ namespace Wabbajack
{
Parent.MWVM.Settings.Performance.AttachToBatchProcessor(installer);
await Task.Run(async () =>
return await Task.Run(async () =>
{
try
{
var workTask = installer.Begin();
ActiveInstallation = installer;
await workTask;
return ErrorResponse.Success;
return await workTask;
}
finally
{

6
Wabbajack/View Models/Installers/VortexInstallerVM.cs
View File

@ -57,7 +57,7 @@ namespace Wabbajack
throw new NotImplementedException();
}
public async Task Install()
public async Task<bool> Install()
{
AInstaller installer;
@ -72,13 +72,13 @@ namespace Wabbajack
{
Parent.MWVM.Settings.Performance.AttachToBatchProcessor(installer);
await Task.Run(async () =>
return await Task.Run(async () =>
{
try
{
var workTask = installer.Begin();
ActiveInstallation = installer;
await workTask;
return await workTask;
}
finally
{