From bd3bb6e47e8d7a8c61430a6aeeffa1489649ad60 Mon Sep 17 00:00:00 2001
From: Max Katz <maxkatz6@outlook.com>
Date: Thu, 2 Jun 2022 22:15:12 -0400
Subject: [PATCH] Check if BindingValue actually has a value

---
 src/Avalonia.Base/Reactive/TypedBindingAdapter.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs b/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs
index f60ef247d5..f75917a00e 100644
--- a/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs
+++ b/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs
@@ -30,13 +30,15 @@ namespace Avalonia.Reactive
             }
             catch (InvalidCastException e)
             {
+                var unwrappedValue = value.HasValue ? value.Value : null;
+                
                 Logger.TryGet(LogEventLevel.Error, LogArea.Binding)?.Log(
                     _target,
                     "Binding produced invalid value for {$Property} ({$PropertyType}): {$Value} ({$ValueType})",
                     _property.Name,
                     _property.PropertyType,
-                    value.Value,
-                    value.Value?.GetType());
+                    unwrappedValue,
+                    unwrappedValue?.GetType());
                 PublishNext(BindingValue<T>.BindingError(e));
             }
         }