Merge pull request #23 from jp2masa/fixes

Fixed KeyNotFoundException in XamlNeedsParentStackCache
kekekeks · Aug 16, 2020 · 697a419 · 697a419
2 parents 08f167b + 323cffc
commit 697a419
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/XamlX/IL/Emitters/ObjectInitializationNodeEmitter.cs b/src/XamlX/IL/Emitters/ObjectInitializationNodeEmitter.cs
@@ -70,11 +70,7 @@ class XamlNeedsParentStackCache : Dictionary<IXamlAstNode, bool>
     {
         public static void Verify(XamlContextBase ctx, IXamlAstNode node)
         {
-            var cache = ctx.GetItem<XamlNeedsParentStackCache>();
-            // There is no parent stack
-            if (cache == null)
-                return;
-            if (!cache.ContainsKey(node))
+            if (ctx.TryGetItem<XamlNeedsParentStackCache>(out var cache) && !cache.ContainsKey(node))
                 throw new XamlLoadException("Node needs parent stack, but one doesn't seem to be provided", node);
         }
         class ParentStackVisitor : IXamlAstVisitor