Merge pull request #2132 from cwensley/curtis/wpf-fix-dialog-owner-crash

Wpf: Fix crash when closing a Dialog
picoe · Jan 31, 2022 · 0efdb4b · 0efdb4b
2 parents 5fe2ade + 10e26bd
commit 0efdb4b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Eto.Wpf/Forms/FormHandler.cs b/src/Eto.Wpf/Forms/FormHandler.cs
@@ -56,6 +56,13 @@ public virtual void Show()
 			WpfFrameworkElementHelper.ShouldCaptureMouse = false;
 		}
 
+		protected override void InternalClose()
+		{
+			// Clear owner so WPF doesn't change the z-order of the parent when closing
+			SetOwner(null);
+			Control.Close();
+		}
+
 		public bool ShowActivated
 		{
 			get { return Control.ShowActivated; }

diff --git a/src/Eto.Wpf/Forms/WpfWindow.cs b/src/Eto.Wpf/Forms/WpfWindow.cs
@@ -400,6 +400,8 @@ public Eto.Forms.ToolBar ToolBar
 				toolBarHolder.Content = toolBar != null ? toolBar.ControlObject : null;
 			}
 		}
+
+		protected virtual void InternalClose() => Control.Close();
 
 		public void Close()
 		{
@@ -408,9 +410,7 @@ public void Close()
 				// prevent crash if we call this more than once..
 				if (!IsClosing)
 				{
-					// Clear owner so WPF doesn't change the z-order of the parent when closing
-					SetOwner(null);
-					Control.Close();
+					InternalClose();
 				}
 			}
 			else