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

1 files changed, 16 insertions, 10 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 1612eb36c..6146d8f45 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -89,18 +89,22 @@ namespace Tango.MachineStudio.UI.StudioApplication
             get { return _connectedMachine; }
             private set
             {
-                _connectedMachine = value;
-                RaisePropertyChangedAuto();
-                RaisePropertyChanged(nameof(IsMachineConnected));
-                RaisePropertyChanged(nameof(IsMachineConnectedViaTCP));
-
-                if (_connectedMachine != null)
+                if (_connectedMachine != value)
                 {
-                    _connectedMachine.StateChanged -= ConnectedMachine_StateChanged;
-                    _connectedMachine.StateChanged += ConnectedMachine_StateChanged;
-                }
+                    _connectedMachine = value;
+                    RaisePropertyChangedAuto();
+                    RaisePropertyChanged(nameof(IsMachineConnected));
+                    RaisePropertyChanged(nameof(IsMachineConnectedViaTCP));
 
-                ConnectedMachineChanged?.Invoke(this, _connectedMachine);
+                    if (_connectedMachine != null)
+                    {
+                        _connectedMachine.StateChanged -= ConnectedMachine_StateChanged;
+                        _connectedMachine.StateChanged += ConnectedMachine_StateChanged;
+                    }
+
+
+                    ConnectedMachineChanged?.Invoke(this, _connectedMachine);
+                }
             }
         }
 
@@ -366,6 +370,8 @@ namespace Tango.MachineStudio.UI.StudioApplication
 
                 ConnectedMachine = connectedMachine;
                 ConnectedMachine.SetMachine(Machine);
+                var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
+                ConnectedMachine.JobUploadStrategy = settings.JobUploadStrategy;
             }
             else
             {