From 5f7818fa08e4a6786187d14f8951a0c414c35b33 Mon Sep 17 00:00:00 2001 From: Max Katz Date: Sat, 25 Jun 2022 20:47:02 -0400 Subject: [PATCH] Fix DirectBindingSubscription NRE --- src/Avalonia.Base/AvaloniaObject.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs index 1f14ddede4..6633eabb5d 100644 --- a/src/Avalonia.Base/AvaloniaObject.cs +++ b/src/Avalonia.Base/AvaloniaObject.cs @@ -935,7 +935,8 @@ namespace Avalonia public void Dispose() { - _subscription.Dispose(); + // _subscription can be null, if Subscribe failed with an exception. + _subscription?.Dispose(); _owner._directBindings!.Remove(this); }