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

1 files changed, 13 insertions, 1 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 069e33f7e..4e3aa4c93 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
@@ -838,7 +838,19 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     try
                     {
                         IsFree = false;
-                        await SelectedMachine.DeleteCascadeAsync(MachinesAdapter.Context);
+
+                        var machineToDelete = await new MachineBuilder(MachinesAdapter.Context).Set(SelectedMachine).WithConfiguration().BuildAsync();
+
+                        await machineToDelete.DeleteCascadeAsync(MachinesAdapter.Context);
+                        await machineToDelete.Configuration.DeleteCascadeAsync(MachinesAdapter.Context);
+                        foreach (var dispenser in machineToDelete.Configuration.NoneEmptyIdsPacks.Select(x => x.Dispenser))
+                        {
+                            if (dispenser != null)
+                            {
+                                await dispenser.DeleteCascadeAsync(MachinesAdapter.Context);
+                            }
+                        }
+
                         _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.MachineDeleted, _authentication.CurrentUser, SelectedMachine.Name, SelectedMachine, "Machine deleted using Machine Studio.");
                         MachinesAdapter.Context.Machines.Remove(SelectedMachine);
                         MachinesAdapter.Machines.Remove(SelectedMachine);