Merge branch 'master' into FixCopyPasteMistake

5 years ago · 16597c4b29
1 changed files with 6 additions and 1 deletions
--- a/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
+++ b/src/Avalonia.Visuals/Rendering/SceneGraph/SceneBuilder.cs
@ -126,7 +126,12 @@ namespace Avalonia.Rendering.SceneGraph

            while (node == null && visual.IsVisible)
            {
-                visual = visual.VisualParent!;
+                var parent = visual.VisualParent;
+
+                if (parent is null)
+                    return null;
+
+                visual = parent;
                node = scene.FindNode(visual);
            }