Merge pull request #8252 from AvaloniaUI/safe-log-typed-adapter

Check if BindingValue actually has a value before logging an error
AvaloniaUI · Jun 3, 2022 · d18f979 · d18f979
1 parent 5d360fa
commit d18f979
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs b/src/Avalonia.Base/Reactive/TypedBindingAdapter.cs
@@ -30,13 +30,15 @@ public void OnNext(BindingValue<object?> value)
             }
             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));
             }
         }