From b33e66dc7d2dc74231675c1414368bac815f4f4d Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Mon, 19 Apr 2021 12:38:16 +0300 Subject: machine delete fix. --- .../Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner') 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 10141d28d..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 @@ -843,9 +843,12 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels await machineToDelete.DeleteCascadeAsync(MachinesAdapter.Context); await machineToDelete.Configuration.DeleteCascadeAsync(MachinesAdapter.Context); - foreach (var dispenser in machineToDelete.Configuration.IdsPacks.Select(x => x.Dispenser)) + foreach (var dispenser in machineToDelete.Configuration.NoneEmptyIdsPacks.Select(x => x.Dispenser)) { - await dispenser.DeleteCascadeAsync(MachinesAdapter.Context); + if (dispenser != null) + { + await dispenser.DeleteCascadeAsync(MachinesAdapter.Context); + } } _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.MachineDeleted, _authentication.CurrentUser, SelectedMachine.Name, SelectedMachine, "Machine deleted using Machine Studio."); -- cgit v1.3.1