From ecabeba4d15540168507822472f917c58bd768ae Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Tue, 25 Jun 2019 22:49:02 +0200
Subject: [PATCH] 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.
---
 src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs b/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
index 990a4b04f2..0ffd6a9539 100644
--- a/src/Avalonia.Base/Data/Converters/DefaultValueConverter.cs
+++ b/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)