From 995d21a605134592855acc384765cf89504eacee Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Sat, 20 Jul 2019 16:17:43 -0700 Subject: [PATCH] Handle null namescope in binding --- src/Markup/Avalonia.Markup/Data/Binding.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup/Data/Binding.cs b/src/Markup/Avalonia.Markup/Data/Binding.cs index 589f223e23..50288d758e 100644 --- a/src/Markup/Avalonia.Markup/Data/Binding.cs +++ b/src/Markup/Avalonia.Markup/Data/Binding.cs @@ -71,7 +71,8 @@ namespace Avalonia.Data enableDataValidation = enableDataValidation && Priority == BindingPriority.LocalValue; - NameScope.TryGetTarget(out var nameScope); + INameScope nameScope; + NameScope?.TryGetTarget(out nameScope); var (node, mode) = ExpressionObserverBuilder.Parse(Path, enableDataValidation, TypeResolver, nameScope);