Fixed cancel button to not prematurely cancel changes

inabox.wpf/DynamicGrid/DynamicEditorForm/DynamicEditorForm.xaml.cs

@@ -154,6 +154,10 @@ public partial class DynamicEditorForm : ThemableChromelessWindow, IDynamicEdito
                     Close();
                     break;
             }
+            if (Result == false)
+            {
+                Form.CancelItem();
+            }
         }
         else
         {
@@ -203,6 +207,7 @@ public partial class DynamicEditorForm : ThemableChromelessWindow, IDynamicEdito
             Result = null;
             return;
         }
+
         SubPanelClosed?.Invoke(this);
     }
 

inabox.wpf/DynamicGrid/DynamicEditorForm/EmbeddedDynamicEditorForm.xaml.cs

@@ -389,8 +389,6 @@ namespace InABox.DynamicGrid
 
         private void CancelButton_Click(object sender, RoutedEventArgs e)
         {
-            CancelItem();
-
             OnCancel?.Invoke();
             //OKButton.IsEnabled = false;
             //CancelButton.IsEnabled = false;