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

1 files changed, 2 insertions, 1 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 1be62565b..0235f8cca 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/StudioApplication/DefaultStudioApplicationManager.cs
@@ -26,6 +26,7 @@ using Tango.MachineStudio.Common.Notifications;
 using Tango.MachineStudio.UI.Views;
 using Tango.Integration.Operation;
 using Tango.MachineStudio.UI.Windows;
+using Tango.BL.Builders;
 
 namespace Tango.MachineStudio.UI.StudioApplication
 {
@@ -375,8 +376,8 @@ namespace Tango.MachineStudio.UI.StudioApplication
                     throw new NullReferenceException($"The specified machine '{connectedMachine.SerialNumber}' could not be found on the database.");
                 }
 
+                connectedMachine.SetMachine(Machine);
                 ConnectedMachine = connectedMachine;
-                ConnectedMachine.SetMachine(Machine);
                 var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
                 ConnectedMachine.JobUploadStrategy = settings.JobUploadStrategy;
             }