Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 3 insertions, 1 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 ee1b39ca6..48aae2b8f 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs
@@ -59,6 +59,7 @@ namespace Tango.PPC.UI.ViewModels
 
         private MachineSetupResult _setup_result;
         private IOperationSystemManager _operationSystemManager;
+        private IPPCApplicationManager _appManager;
 
         #region Properties
 
@@ -193,6 +194,7 @@ namespace Tango.PPC.UI.ViewModels
         /// <param name="machineSetupManager">The machine setup manager.</param>
         public MachineSetupViewVM(IPPCApplicationManager applicationManager, IMachineSetupManager machineSetupManager, IOperationSystemManager operationSystemManager)
         {
+            _appManager = applicationManager;
             MachineSetupManager = machineSetupManager;
 
             DeploymentSlot = Settings.DeploymentSlot;
@@ -282,7 +284,7 @@ namespace Tango.PPC.UI.ViewModels
             LogManager.Log($"Executing '{updater_exe}' with arguments '{PathHelper.GetStartupPath()}'...");
             Process.Start(updater_exe, PathHelper.GetStartupPath());
             LogManager.Log("Terminating application process!");
-            Environment.Exit(0);
+            _appManager.ShutDown();
         }
 
         /// <summary>