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

1 files changed, 3 insertions, 3 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
index 7896367ec..246b86469 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs
@@ -119,7 +119,7 @@ namespace Tango.PPC.MachineSettings.ViewModels
             {
                 Machine.SupportedJobTypes = SelectedJobTypes.SynchedSource.ToList();
                 Machine.SupportedColorSpaces = SelectedColorSpaces.SynchedSource.ToList();
-                Machine.ShallowCopyTo(MachineProvider.Machine);
+                Machine.MapPrimitivesWithStringsNoNullsTo(MachineProvider.Machine);
 
                 Settings.EnableHotSpot = EnableHotSpot;
                 Settings.HotSpotPassword = HotSpotPassword;
@@ -149,8 +149,8 @@ namespace Tango.PPC.MachineSettings.ViewModels
         {
             base.OnNavigatedTo();
 
-            Machine = new Machine();
-            MachineProvider.Machine.ShallowCopyTo(Machine);
+            Machine = MachineProvider.Machine.ShallowClone();
+
             RaisePropertyChanged(nameof(Machine));
 
             _enableHotSpot = HotSpotProvider.IsEnabled;