From 05496ccf349643b087586f34cf8d62bad035b137 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dariusz=20Komosi=C5=84ski?= Date: Mon, 12 Apr 2021 18:46:09 +0200 Subject: [PATCH] Fix owned windows and dialogs not having a parent. --- src/Windows/Avalonia.Win32/WindowImpl.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs index f3f8618cc9..22d6789242 100644 --- a/src/Windows/Avalonia.Win32/WindowImpl.cs +++ b/src/Windows/Avalonia.Win32/WindowImpl.cs @@ -580,7 +580,9 @@ namespace Avalonia.Win32 public void SetParent(IWindowImpl parent) { - var parentHwnd = ((WindowImpl)parent)?._hwnd ?? IntPtr.Zero; + _parent = (WindowImpl)parent; + + var parentHwnd = _parent?._hwnd ?? IntPtr.Zero; if (parentHwnd == IntPtr.Zero && !_windowProperties.ShowInTaskbar) {