From e252a35509b2e20e0fa19522ee1b97d4d90ff7ae Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Wed, 15 Jun 2016 22:57:24 +0200
Subject: [PATCH] Don't delay bind to DataContext.

DataContext bindings are special in that they return null instead of
UnsetValue when broken, and it's important that they do that when things
are being set up.
---
 .../Avalonia.Markup.Xaml/Context/PropertyAccessor.cs     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Markup/Avalonia.Markup.Xaml/Context/PropertyAccessor.cs b/src/Markup/Avalonia.Markup.Xaml/Context/PropertyAccessor.cs
index 20d9b07daf..e295292ba0 100644
--- a/src/Markup/Avalonia.Markup.Xaml/Context/PropertyAccessor.cs
+++ b/src/Markup/Avalonia.Markup.Xaml/Context/PropertyAccessor.cs
@@ -136,7 +136,14 @@ namespace Avalonia.Markup.Xaml.Context
 
             if (control != null)
             {
-                DelayedBinding.Add(control, property, binding);
+                if (property != Control.DataContextProperty)
+                {
+                    DelayedBinding.Add(control, property, binding);
+                }
+                else
+                {
+                    control.Bind(property, binding);
+                }
             }
             else
             {