Skip to content

Commit

Permalink
Backport fix NullReferenceException in X11Window.Activate (#14787)
Browse files Browse the repository at this point in the history
  • Loading branch information
pos777 authored Mar 5, 2024
1 parent f95a329 commit 75aea9d
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/Avalonia.X11/X11Window.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1103,7 +1103,9 @@ public void Activate()
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);
}
}

Expand Down

0 comments on commit 75aea9d

Please sign in to comment.