Backport fix NullReferenceException in X11Window.Activate (#14787)

2 years ago · 75aea9d1db
1 changed files with 3 additions and 1 deletions
--- a/src/Avalonia.X11/X11Window.cs
+++ b/src/Avalonia.X11/X11Window.cs
@ -1103,7 +1103,9 @@ namespace Avalonia.X11
            else
            {
                XRaiseWindow(_x11.Display, _handle);
-                XSetInputFocus(_x11.Display, _focusProxy._handle, 0, IntPtr.Zero);
+
+                if (_focusProxy is not null)
+                    XSetInputFocus(_x11.Display, _focusProxy._handle, 0, IntPtr.Zero);
            }
        }