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

1 files changed, 11 insertions, 3 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
index d8369ea7b..381101c7e 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Technician/ViewModels/MachineTechViewVM.cs
@@ -224,7 +224,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
 
             UploadHardwareConfigurationCommand = new RelayCommand(UploadHardwareConfiguration);
             SyncHardwareConfigurationCommand = new RelayCommand(SyncHardwareConfiguration);
-            ResetHardwareConfigurationCommand = new RelayCommand(ResetHardwareConfiguration);
+            ResetHardwareConfigurationCommand = new RelayCommand(() => ResetHardwareConfiguration());
         }
 
         #endregion
@@ -239,6 +239,11 @@ namespace Tango.MachineStudio.Technician.ViewModels
         private void ApplicationManager_ConnectedMachineChanged(object sender, IExternalBridgeClient machine)
         {
             MachineOperator = machine;
+
+            if (MachineOperator != null)
+            {
+                ResetHardwareConfiguration(false);
+            }
         }
 
         /// <summary>
@@ -1430,7 +1435,7 @@ namespace Tango.MachineStudio.Technician.ViewModels
             }
         }
 
-        private void ResetHardwareConfiguration()
+        private void ResetHardwareConfiguration(bool showMessage = true)
         {
             if (MachineOperator != null)
             {
@@ -1486,7 +1491,10 @@ namespace Tango.MachineStudio.Technician.ViewModels
                     }
                 }
 
-                _notification.ShowInfo("Visual elements synced to hardware version " + hw.Name + ", " + hw.Version + ".");
+                if (showMessage)
+                {
+                    _notification.ShowInfo("Visual elements synced to hardware version " + hw.Name + ", " + hw.Version + ".");
+                }
             }
         }