Browse Source

Null check in ItemsControl on Materialized and Dematerialized, to prevent

exceptions being thrown, trying to do is check on null.
pull/799/head
Dan Walmsley 10 years ago
parent
commit
59fd92dcfb
  1. 4
      src/Avalonia.Controls/ItemsControl.cs

4
src/Avalonia.Controls/ItemsControl.cs

@ -239,7 +239,7 @@ namespace Avalonia.Controls
{ {
var containerControl = container.ContainerControl as ContentPresenter; 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); ((ISetLogicalParent)containerControl).SetParent(this);
containerControl.UpdateChild(); containerControl.UpdateChild();
@ -278,7 +278,7 @@ namespace Avalonia.Controls
{ {
var containerControl = container.ContainerControl as ContentPresenter; 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); toRemove.Add(containerControl.Child as ILogical);
} }

Loading…
Cancel
Save