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

1 files changed, 5 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineSerialViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineSerialViewVM.cs
index 9f366829a..ad4cfa96d 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineSerialViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineSerialViewVM.cs
@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Tango.BL;
 using Tango.BL.Entities;
 using Tango.Core.Commands;
+using Tango.MachineStudio.Common;
 using Tango.MachineStudio.Common.Notifications;
 using Tango.Settings;
 
@@ -24,7 +25,10 @@ namespace Tango.MachineStudio.UI.ViewModels
         public MachineSerialViewVM()
         {
             OKCommand = new RelayCommand(Accept, () => SelectedMachine != null);
-            SelectedMachine = ObservablesEntitiesAdapter.Instance.Machines.SingleOrDefault(x => x.SerialNumber == SettingsManager.Default.MachineStudio.LastVirtualMachineSerialNumber);
+
+            var settings = SettingsManager.Default.GetOrCreate<MachineStudioSettings>();
+
+            SelectedMachine = ObservablesEntitiesAdapter.Instance.Machines.SingleOrDefault(x => x.SerialNumber == settings.LastVirtualMachineSerialNumber);
         }
     }
 }