diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-04-19 12:38:16 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-04-19 12:38:16 +0300 |
| commit | b33e66dc7d2dc74231675c1414368bac815f4f4d (patch) | |
| tree | 40c68e8f9b06b842fef2828c0ecf1409c5d86b20 /Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner | |
| parent | 8536a00b08a85794b9bb59fb6365b25a9b0a2f8d (diff) | |
| download | Tango-b33e66dc7d2dc74231675c1414368bac815f4f4d.tar.gz Tango-b33e66dc7d2dc74231675c1414368bac815f4f4d.zip | |
machine delete fix.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs | 7 |
1 files changed, 5 insertions, 2 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 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."); |