From 5e82024214338f868642c1f4943d0f63180fe42a Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Sun, 23 May 2021 15:33:57 +0300 Subject: Fixed issue with machine delete error. --- .../Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 4b5d0897d..00ee4f3bd 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 @@ -870,6 +870,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels { IsFree = false; + var selectedMachine = SelectedMachine; + using (ObservablesContext db = ObservablesContext.CreateDefault()) { var machineToDelete = await new MachineBuilder(db).Set(SelectedMachine.Guid).WithConfiguration().BuildAsync(); @@ -884,14 +886,14 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels } } - await LoadMachines(); + _actionLogManager.InsertLog(ActionLogType.MachineDeleted, _authentication.CurrentUser, selectedMachine.Name, machineToDelete, "Machine deleted using Machine Studio."); - _actionLogManager.InsertLog(BL.Enumerations.ActionLogType.MachineDeleted, _authentication.CurrentUser, SelectedMachine.Name, machineToDelete, "Machine deleted using Machine Studio."); + await LoadMachines(); } } catch (Exception ex) { - LogManager.Log(ex, $"Error removing machine selected machine."); + LogManager.Log(ex, $"Error removing selected machine."); _notification.ShowError($"An error occurred while trying to delete the selected machine.\n{ex.Message}"); } finally -- cgit v1.3.1