From 40746c60fed9e70f3cb7f6f12f55595a77a1adfa Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Sun, 24 Feb 2019 19:04:47 +0200 Subject: Fixed PPC and Machine Studio issues before next release. Started working on Advanced Installer libraries. --- .../PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs') diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs index 6046f0300..b5b5f56bc 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs @@ -194,7 +194,7 @@ namespace Tango.PPC.UI.ViewModels try { - await MachineUpdateManager.UpdateDB(_db_compare_result); + await MachineUpdateManager.UpdateDB(_db_compare_result, MachineProvider.Machine.SerialNumber); LogManager.Log("Database update completed."); await NavigateTo(MachineUpdateView.UpdateCompletedView); } @@ -213,14 +213,12 @@ namespace Tango.PPC.UI.ViewModels private void CompleteUpdate() { + LogManager.Log("Completing machine update..."); + if (!IsDbUpdate) { String updater_exe = Path.Combine(_update_result.UpdatePackagePath, "Tango.PPC.Updater.exe"); - LogManager.Log("Completing machine setup..."); - LogManager.Log($"Executing '{updater_exe}' with arguments '{PathHelper.GetStartupPath()}'..."); - Process.Start(updater_exe, PathHelper.GetStartupPath()); - LogManager.Log("Terminating application process!"); - ApplicationManager.ShutDown(); + ApplicationManager.UpdateApplication(updater_exe, PathHelper.GetStartupPath()); } else { -- cgit v1.3.1