MERGE!

1 files changed, 35 insertions, 6 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
index b95a74a3e..b0315e633 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -11,10 +11,13 @@ using Tango.MachineStudio.Common.Navigation;
 using GalaSoft.MvvmLight.Ioc;
 using System.Reflection;
 using System.Collections;
+using Tango.Integration.Services;
+using Tango.Core;
+using Tango.Logging;
 
 namespace Tango.MachineStudio.UI.StudioApplication
 {
-    public class DefaultStudioApplicationManager : IStudioApplicationManager
+    public class DefaultStudioApplicationManager : ExtendedObject, IStudioApplicationManager
     {
         private INavigationManager _navigationManager;
 
@@ -23,12 +26,40 @@ namespace Tango.MachineStudio.UI.StudioApplication
             _navigationManager = navigationManager;
         }
 
+        public bool IsShuttingDown { get; private set; }
+
+        private IExternalBridgeClient _connectedMachine;
+
+        public IExternalBridgeClient ConnectedMachine
+        {
+            get { return _connectedMachine; }
+            set { _connectedMachine = value; RaisePropertyChangedAuto(); RaisePropertyChanged(nameof(IsMachineConnected)); }
+        }
+
+        public bool IsMachineConnected
+        {
+            get { return ConnectedMachine != null; }
+        }
+
         public async void ShutDown()
         {
-            _navigationManager.NavigateTo(NavigationView.ShutdownView);
+            if (IsShuttingDown) return;
+
+            IsShuttingDown = true;
 
             await Task.Factory.StartNew(async () =>
             {
+                try
+                {
+                    if (ConnectedMachine != null)
+                    {
+                        ConnectedMachine.Disconnect().Wait();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    LogManager.Log(ex, "Error disconnecting from machine.");
+                }
 
                 //Do Shutdown Procedures...
                 foreach (var vm in ServiceLocator.Current.GetAllInstancesByBase<IShutdownRequestBlocker>())
@@ -36,14 +67,12 @@ namespace Tango.MachineStudio.UI.StudioApplication
                     var result = await vm.OnShutdownRequest();
                     if (!result)
                     {
-                        ThreadsHelper.InvokeUI(() =>
-                        {
-                            _navigationManager.NavigateTo(NavigationView.MainView);
-                        });
+                        IsShuttingDown = false;
                         return;
                     }
                 }
 
+                _navigationManager.NavigateTo(NavigationView.ShutdownView);
                 Thread.Sleep(3000);
                 Environment.Exit(0);