Fixed bug with null values from markup extensions

9 years ago · f63d5dad93
1 changed files with 2 additions and 2 deletions
--- a/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlObjectWriter.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/PortableXaml/AvaloniaXamlObjectWriter.cs
@ -88,8 +88,8 @@ namespace Avalonia.Markup.Xaml.PortableXaml
            //Portable.Xaml.ComponentModel.ISupportInitialize
            //and we have Avalonia.ISupportInitialize so we need some hacks
            HandleBeginInit(value);
-
-            _delayedValuesHelper.BeginInit(value);
+            if (value != null)
+                _delayedValuesHelper.BeginInit(value);

            base.OnBeforeProperties(value);
        }