From 59fd92dcfb8ba7bb1f38a2b6563110db863e5f96 Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Sat, 12 Nov 2016 19:32:15 +0000 Subject: [PATCH] Null check in ItemsControl on Materialized and Dematerialized, to prevent exceptions being thrown, trying to do is check on null. --- src/Avalonia.Controls/ItemsControl.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs index decc44883b..1ddec7ac85 100644 --- a/src/Avalonia.Controls/ItemsControl.cs +++ b/src/Avalonia.Controls/ItemsControl.cs @@ -239,7 +239,7 @@ namespace Avalonia.Controls { var containerControl = container.ContainerControl as ContentPresenter; - if (containerControl != null && containerControl.Child is ILogical) + if (containerControl != null && containerControl.Child != null && containerControl.Child is ILogical) { ((ISetLogicalParent)containerControl).SetParent(this); containerControl.UpdateChild(); @@ -278,7 +278,7 @@ namespace Avalonia.Controls { var containerControl = container.ContainerControl as ContentPresenter; - if (containerControl != null && containerControl.Child is ILogical) + if (containerControl != null && containerControl.Child != null && containerControl.Child is ILogical) { toRemove.Add(containerControl.Child as ILogical); }