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

1 files changed, 19 insertions, 1 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingViewVM.cs
index 75354caf2..bb503e718 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/ThreadLoadingViewVM.cs
@@ -67,6 +67,13 @@ namespace Tango.PPC.UI.Dialogs
             set { _stage = value; RaisePropertyChangedAuto(); InvalidateRelayCommands(); }
         }
 
+        private bool _isArcHead;
+        public bool IsArcHead
+        {
+            get { return _isArcHead; }
+            set { _isArcHead = value; RaisePropertyChangedAuto(); }
+        }
+
         private String _error;
         public String Error
         {
@@ -74,7 +81,6 @@ namespace Tango.PPC.UI.Dialogs
             set { _error = value; RaisePropertyChangedAuto(); }
         }
 
-
         public RelayCommand ContinueCommand { get; set; }
         public RelayCommand AbortCommand { get; set; }
 
@@ -86,6 +92,9 @@ namespace Tango.PPC.UI.Dialogs
             _settings = SettingsManager.Default.GetOrCreate<PPCSettings>();
 
             MachineProvider.MachineOperator.ThreadLoadingStatusChanged += MachineOperator_ThreadLoadingStatusChanged;
+            MachineProvider.MachineDisconnected += MachineProvider_MachineDisconnected;
+
+            IsArcHead = MachineProvider.Machine.MachineHeadType == BL.Enumerations.HeadTypes.Arc;
 
             ContinueCommand = new RelayCommand(Continue, CanContinue);
             AbortCommand = new RelayCommand(Abort);
@@ -93,6 +102,14 @@ namespace Tango.PPC.UI.Dialogs
             AdaptToState(userInvoked);
         }
 
+        private void MachineProvider_MachineDisconnected(object sender, EventArgs e)
+        {
+            InvokeUI(() =>
+            {
+                Cancel();
+            });
+        }
+
         private void AdaptToState(bool userInvoked = false)
         {
             var status = MachineProvider.MachineOperator.ThreadLoadingStatus;
@@ -258,6 +275,7 @@ namespace Tango.PPC.UI.Dialogs
         private void CleanUp()
         {
             MachineProvider.MachineOperator.ThreadLoadingStatusChanged -= MachineOperator_ThreadLoadingStatusChanged;
+            MachineProvider.MachineDisconnected -= MachineProvider_MachineDisconnected;
 
             if (SelectedRml != null)
             {