diff --git a/Knossos.NET/ViewModels/Templates/Tasks/InstallBuild.cs b/Knossos.NET/ViewModels/Templates/Tasks/InstallBuild.cs index 54515fe4..835a1eb1 100644 --- a/Knossos.NET/ViewModels/Templates/Tasks/InstallBuild.cs +++ b/Knossos.NET/ViewModels/Templates/Tasks/InstallBuild.cs @@ -235,6 +235,7 @@ private async Task InstallVCRedist(bool is86 = false) { { Log.Add(Log.LogSeverity.Error, "TaskItemViewModel.InstallBuild()", $"Unsafe dest path in build '{build.id}': {file.dest}"); CancelTaskCommand(); + return null; } Directory.CreateDirectory(modPath + Path.DirectorySeparatorChar + file.dest); } @@ -359,6 +360,7 @@ private async Task InstallVCRedist(bool is86 = false) { { Log.Add(Log.LogSeverity.Error, "TaskItemViewModel.InstallBuild()", "Error while decompressing the file " + fileFullPath); CancelTaskCommand(); + throw new TaskCanceledException(); } //sender.ProgressBarCurrent = ++ProgressCurrent; ++ProgressCurrent; diff --git a/Knossos.NET/ViewModels/Templates/Tasks/InstallMod.cs b/Knossos.NET/ViewModels/Templates/Tasks/InstallMod.cs index 3e76f791..350806bc 100644 --- a/Knossos.NET/ViewModels/Templates/Tasks/InstallMod.cs +++ b/Knossos.NET/ViewModels/Templates/Tasks/InstallMod.cs @@ -415,6 +415,7 @@ public async Task InstallMod(Mod mod, CancellationTokenSource cancelSource { Log.Add(Log.LogSeverity.Error, "TaskItemViewModel.InstallMod()", "Error while decompressing the file " + fileFullPath); CancelTaskCommand(); + throw new TaskCanceledException(); } File.Delete(fileFullPath); ++ProgressCurrent; diff --git a/Knossos.NET/ViewModels/Templates/Tasks/InstallTool.cs b/Knossos.NET/ViewModels/Templates/Tasks/InstallTool.cs index a564e595..434999a8 100644 --- a/Knossos.NET/ViewModels/Templates/Tasks/InstallTool.cs +++ b/Knossos.NET/ViewModels/Templates/Tasks/InstallTool.cs @@ -110,6 +110,7 @@ public async Task InstallTool(Tool tool, Tool? updateFrom, Action fi { Log.Add(Log.LogSeverity.Error, "TaskItemViewModel.InstallTool()", "Error while decompressing the file " + fileFullPath); CancelTaskCommand(); + throw new TaskCanceledException(); } if (cancellationTokenSource.IsCancellationRequested)