Fixed PPC and Machine Studio issues before next release.

Started working on Advanced Installer libraries.

2 files changed, 6 insertions, 12 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
index 1bd1e1eea..aca9dbcf7 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
@@ -282,13 +282,9 @@ namespace Tango.PPC.UI.ViewModels
         /// </summary>
         private void CompleteSetup()
         {
-            String updater_exe = Path.Combine(_setup_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!");
-            _appManager.ShutDown();
+            String updater_exe = Path.Combine(_setup_result.UpdatePackagePath, "Tango.PPC.Updater.exe");
+            _appManager.UpdateApplication(updater_exe, PathHelper.GetStartupPath());
         }
 
         /// <summary>
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
             {