1 files changed, 10 insertions, 7 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
index 7f6dd8d5f..8f7681718 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.DB/ViewModels/DbTableViewModel.cs
@@ -121,10 +121,10 @@ namespace Tango.MachineStudio.DB.ViewModels
         /// <summary>
         /// Called when delete command invoked.
         /// </summary>
-        protected virtual void OnDelete()
+        protected virtual async void OnDelete()
         {
             SelectedEntity.Deleted = true;
-            SelectedEntity.Save();
+            await SelectedEntity.SaveAsync();
         }
 
         /// <summary>
@@ -153,7 +153,7 @@ namespace Tango.MachineStudio.DB.ViewModels
         /// Called when dialog closes with OK button.
         /// </summary>
         /// <param name="mode">The mode.</param>
-        protected virtual void OnDialogOKPressed(DialogOpenMode mode, T entity)
+        protected virtual async void OnDialogOKPressed(DialogOpenMode mode, T entity)
         {
             if (mode == DialogOpenMode.Editing)
             {
@@ -163,10 +163,13 @@ namespace Tango.MachineStudio.DB.ViewModels
 
             OnBeforeEntitySave(mode, entity);
 
-            entity.Save();
-            IsDialogOpen = false;
-            SelectedEntity = EditEntity;
-            SelectedEntity = null;
+            using (_notification.PushTaskItem("Saving changes to database..."))
+            {
+                await entity.SaveAsync();
+                IsDialogOpen = false;
+                SelectedEntity = EditEntity;
+                SelectedEntity = null;
+            }
         }
 
         /// <summary>