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

Merge pull request #400 from Noggog/failed-compilation-display-bug

Browse Source 
Failed compilation display bug
This commit is contained in:
Timothy Baldridge 2020-01-18 15:31:13 -07:00 committed by GitHub
commit 2a31c85e24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,8 +184,8 @@ namespace Wabbajack
{
try
{
await this.Compiler.Compile();
Completed = ErrorResponse.Success;
var successful = await this.Compiler.Compile();
Completed = ErrorResponse.Create(successful);
}
catch (Exception ex)
{

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

@ -12,6 +12,6 @@ namespace Wabbajack
ModlistSettingsEditorVM ModlistSettings { get; }
void Unload();
IObservable<bool> CanCompile { get; }
Task Compile();
Task<bool> Compile();
}
}

4
Wabbajack/View Models/Compilers/MO2CompilerVM.cs
View File

@ -163,7 +163,7 @@ namespace Wabbajack
ModlistSettings?.Save();
}
public async Task Compile()
public async Task<bool> Compile()
{
string outputFile;
if (string.IsNullOrWhiteSpace(Parent.OutputLocation.TargetPath))
@ -193,7 +193,7 @@ namespace Wabbajack
{
Parent.MWVM.Settings.Performance.AttachToBatchProcessor(ActiveCompilation);
await ActiveCompilation.Begin();
return await ActiveCompilation.Begin();
}
}
finally

4
Wabbajack/View Models/Compilers/VortexCompilerVM.cs
View File

@ -177,7 +177,7 @@ namespace Wabbajack
GameLocation.TargetPath = StoreHandler.Instance.GetGamePath(SelectedGame.Game, StoreType.GOG);
}
public async Task Compile()
public async Task<bool> Compile()
{
string outputFile = $"{ModlistSettings.ModListName}{ExtensionManager.Extension}";
if (!string.IsNullOrWhiteSpace(Parent.OutputLocation.TargetPath))
@ -204,7 +204,7 @@ namespace Wabbajack
})
{
Parent.MWVM.Settings.Performance.AttachToBatchProcessor(ActiveCompilation);
await ActiveCompilation.Begin();
return await ActiveCompilation.Begin();
}
}
finally

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
{