Browse Source

Fix conversion of null in DefaultValueConverter.

`null` is a valid value for a non-value type so don't convert it to `{unset}`.

Fixes #1701.
pull/2685/head
Steven Kirk 7 years ago
parent
commit
ecabeba4d1
  1. 2
      src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs

2
src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs

@ -31,7 +31,7 @@ namespace Avalonia.Data.Converters
{
if (value == null)
{
return AvaloniaProperty.UnsetValue;
return targetType.IsValueType ? AvaloniaProperty.UnsetValue : null;
}
if (typeof(ICommand).IsAssignableFrom(targetType) && value is Delegate d && d.Method.GetParameters().Length <= 1)

Loading…
Cancel
Save