From 51a47b3a946d693d54abbec0e9dd3b184aba1969 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Mon, 22 Jan 2018 00:07:19 +0100 Subject: [PATCH] Instance can be null here. Was causing intermittently failing test: https://ci.appveyor.com/project/AvaloniaUI/Avalonia/build/0.1.4468 --- .../Data/Plugins/AvaloniaPropertyAccessorPlugin.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Markup/Avalonia.Markup/Data/Plugins/AvaloniaPropertyAccessorPlugin.cs b/src/Markup/Avalonia.Markup/Data/Plugins/AvaloniaPropertyAccessorPlugin.cs index 3f6f15ed5b..90eabc69fb 100644 --- a/src/Markup/Avalonia.Markup/Data/Plugins/AvaloniaPropertyAccessorPlugin.cs +++ b/src/Markup/Avalonia.Markup/Data/Plugins/AvaloniaPropertyAccessorPlugin.cs @@ -104,7 +104,7 @@ namespace Avalonia.Markup.Data.Plugins protected override void SubscribeCore(IObserver observer) { - _subscription = Instance.GetWeakObservable(_property).Subscribe(observer); + _subscription = Instance?.GetWeakObservable(_property).Subscribe(observer); } } }