Fixed PPC and Machine Studio issues before next release.

Started working on Advanced Installer libraries.

1 files changed, 28 insertions, 1 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index 4b5874907..f7711318f 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -161,7 +161,7 @@ namespace Tango.PPC.UI.PPCApplication
 
                     //Start watchdog
                     _watchdogServer = new WatchDogServer(Application.Current.Dispatcher);
-#if RELEASE
+#if !DEBUG
                    
                     if (settings.EnableWatchDog)
                     {
@@ -381,6 +381,33 @@ namespace Tango.PPC.UI.PPCApplication
         }
 
         /// <summary>
+        /// Runs the updater utility and exits the application.
+        /// </summary>
+        public void UpdateApplication(String updaterPath, String arguments)
+        {
+            if (IsShuttingDown) return;
+
+            IsShuttingDown = true;
+
+            try
+            {
+                _watchdogServer.Dispose();
+
+                foreach (var vm in TangoIOC.Default.GetAllInstancesByBase<PPCViewModel>())
+                {
+                    vm.OnApplicationShuttingDown();
+                }
+            }
+            catch { }
+
+            LogManager.Log($"Executing '{updaterPath}' with arguments '{arguments}'...");
+            Process.Start(updaterPath, arguments);
+
+            LogManager.Log("Terminating application...");
+            Environment.Exit(0);
+        }
+
+        /// <summary>
         /// Enteres the application technician mode.
         /// </summary>
         public void EnterTechnicianMode()