From 280f373d7c368d7658d26915f77e91659eaaef6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tiago=20Concei=C3=A7=C3=A3o?= <Tiago_caza@hotmail.com>
Date: Mon, 26 Sep 2022 23:29:44 +0100
Subject: [PATCH] Fix Dereference of a possibly null reference and simplify
 checks

---
 src/Avalonia.Controls/Window.cs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/Avalonia.Controls/Window.cs b/src/Avalonia.Controls/Window.cs
index b1d50cf430..1a7dca737e 100644
--- a/src/Avalonia.Controls/Window.cs
+++ b/src/Avalonia.Controls/Window.cs
@@ -852,24 +852,20 @@ namespace Avalonia.Controls
 
                 if (owner is not null)
                 {
-                    screen = Screens.ScreenFromWindow(owner);
-
-                    screen ??= Screens.ScreenFromPoint(owner.Position);
+                    screen = Screens.ScreenFromWindow(owner) 
+                             ?? Screens.ScreenFromPoint(owner.Position);
                 }
 
-                if (screen is null)
-                {
-                    screen = Screens.ScreenFromPoint(Position);
-                }
+                screen ??= Screens.ScreenFromPoint(Position);
 
-                if (screen != null)
+                if (screen is not null)
                 {
                     Position = screen.WorkingArea.CenterRect(rect).Position;
                 }
             }
             else if (startupLocation == WindowStartupLocation.CenterOwner)
             {
-                var ownerSize = owner.FrameSize ?? owner.ClientSize;
+                var ownerSize = owner!.FrameSize ?? owner.ClientSize;
                 var ownerRect = new PixelRect(
                     owner.Position,
                     PixelSize.FromSize(ownerSize, scaling));