From ecb981da2d1ca386a350d108b72e30835d77f044 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Mon, 20 Dec 2021 09:30:10 +0100
Subject: [PATCH] Small tidy up.

---
 src/Avalonia.Layout/ElementManager.cs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Avalonia.Layout/ElementManager.cs b/src/Avalonia.Layout/ElementManager.cs
index 039eb52317..9a033ca447 100644
--- a/src/Avalonia.Layout/ElementManager.cs
+++ b/src/Avalonia.Layout/ElementManager.cs
@@ -75,7 +75,9 @@ namespace Avalonia.Layout
 
             if (IsVirtualizingContext)
             {
-                if (_realizedElements[realizedIndex] == null)
+                element = _realizedElements[realizedIndex];
+
+                if (element == null)
                 {
                     // Sentinel. Create the element now since we need it.
                     int dataIndex = GetDataIndexFromRealizedRangeIndex(realizedIndex);
@@ -85,10 +87,6 @@ namespace Avalonia.Layout
                         ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle);
                     _realizedElements[realizedIndex] = element;
                 }
-                else
-                {
-                    element = _realizedElements[realizedIndex];
-                }
             }
             else
             {
@@ -98,7 +96,7 @@ namespace Avalonia.Layout
                     ElementRealizationOptions.ForceCreate | ElementRealizationOptions.SuppressAutoRecycle);
             }
 
-            return element!;
+            return element;
         }
 
         public void Add(ILayoutable element, int dataIndex)