1 files changed, 6 insertions, 6 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index cedbcf9a6..6fbd5852d 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -529,7 +529,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                                 Configuration = Configuration,
                                 Machine = Machine,
                             });
-                            await Machine.SaveAsync();
+                            await Machine.SaveAsync(Adapter.Context);
 
                             Machine = Adapter.Machines.SingleOrDefault(x => x.Guid == Machine.Guid);
                             Configuration = Machine.Configuration.CloneConfiguration();
@@ -558,12 +558,12 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                         }
                         else
                         {
-                            machine.Configuration.DefferedDelete();
+                            machine.Configuration.DefferedDelete(Adapter.Context);
                         }
 
                         machine.Configuration = Configuration;
 
-                        await machine.SaveAsync();
+                        await machine.SaveAsync(Adapter.Context);
 
                         Machine = Adapter.Machines.SingleOrDefault(x => x.Guid == machine.Guid);
                         Configuration = Machine.Configuration.CloneConfiguration();
@@ -624,7 +624,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                         {
                             vm.SelectedVersion.DefaultConfiguration = Configuration.CloneConfiguration();
                             vm.SelectedVersion.DefaultConfigurationGuid = vm.SelectedVersion.DefaultConfiguration.Guid;
-                            await vm.SelectedVersion.SaveAsync();
+                            await vm.SelectedVersion.SaveAsync(Adapter.Context);
                         }
                         else
                         {
@@ -634,7 +634,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
 
                             newVersion.DefaultConfiguration = Configuration.CloneConfiguration();
                             newVersion.DefaultConfigurationGuid = newVersion.DefaultConfiguration.Guid;
-                            await newVersion.SaveAsync();
+                            await newVersion.SaveAsync(Adapter.Context);
                         }
                     }
                 }
@@ -662,7 +662,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         {
             if (module is MachineDesignerModule)
             {
-                SelectedMachine = args as Machine;
+                SelectedMachine = Adapter.Machines.SingleOrDefault(x => x.Guid == (args as Machine).Guid);
             }
         }