Merge pull request AvaloniaUI#8391 from AvaloniaUI/DirectBindingSubsc…

…ription-NRE Fix DirectBindingSubscription NRE
donandren · Jul 6, 2022 · 1c13b70 · 1c13b70
1 parent 3878b13
commit 1c13b70
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Avalonia.Base/AvaloniaObject.cs b/src/Avalonia.Base/AvaloniaObject.cs
@@ -916,7 +916,8 @@ public DirectBindingSubscription(
 
             public void Dispose()
             {
-                _subscription.Dispose();
+                // _subscription can be null, if Subscribe failed with an exception.
+                _subscription?.Dispose();
                 _owner._directBindings!.Remove(this);
             }