From eb09e522c115bfae03c91e8bf7fdba03414e25ac Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Tue, 4 Apr 2023 11:48:20 -0400
Subject: [PATCH] Changes after review

---
 src/Avalonia.Base/Controls/ResourceDictionary.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Avalonia.Base/Controls/ResourceDictionary.cs b/src/Avalonia.Base/Controls/ResourceDictionary.cs
index 878797d9b6..231a19baab 100644
--- a/src/Avalonia.Base/Controls/ResourceDictionary.cs
+++ b/src/Avalonia.Base/Controls/ResourceDictionary.cs
@@ -15,7 +15,7 @@ namespace Avalonia.Controls
     /// </summary>
     public class ResourceDictionary : IResourceDictionary
     {
-        private DeferredItem? s_lastDeferredItem;
+        private object? lastDeferredItemKey;
         private Dictionary<object, object?>? _inner;
         private IResourceHost? _owner;
         private AvaloniaList<IResourceProvider>? _mergedDictionaries;
@@ -243,7 +243,7 @@ namespace Avalonia.Controls
                 if (value is DeferredItem deffered)
                 {
                     // Avoid simple reentrancy, which could commonly occur on redefining the resource.
-                    if (s_lastDeferredItem == deffered)
+                    if (lastDeferredItemKey == key)
                     {
                         value = null;
                         return false;
@@ -251,7 +251,7 @@ namespace Avalonia.Controls
 
                     try
                     {
-                        s_lastDeferredItem = deffered;
+                        lastDeferredItemKey = key;
                         _inner[key] = value = deffered.Factory(null) switch
                         {
                             ITemplateResult t => t.Result,
@@ -261,7 +261,7 @@ namespace Avalonia.Controls
                     }
                     finally
                     {
-                        s_lastDeferredItem = null;
+                        lastDeferredItemKey = null;
                     }
                 }
                 return true;