diff --git a/src/Avalonia.Controls/ItemsControl.cs b/src/Avalonia.Controls/ItemsControl.cs index 70f771ca00..1fb13f2e98 100644 --- a/src/Avalonia.Controls/ItemsControl.cs +++ b/src/Avalonia.Controls/ItemsControl.cs @@ -79,7 +79,7 @@ namespace Avalonia.Controls /// /// Gets the for the control. /// - public IItemContainerGenerator? ItemContainerGenerator + public IItemContainerGenerator ItemContainerGenerator { get { @@ -87,13 +87,10 @@ namespace Avalonia.Controls { _itemContainerGenerator = CreateItemContainerGenerator(); - if (_itemContainerGenerator != null) - { - _itemContainerGenerator.ItemTemplate = ItemTemplate; - _itemContainerGenerator.Materialized += (_, e) => OnContainersMaterialized(e); - _itemContainerGenerator.Dematerialized += (_, e) => OnContainersDematerialized(e); - _itemContainerGenerator.Recycled += (_, e) => OnContainersRecycled(e); - } + _itemContainerGenerator.ItemTemplate = ItemTemplate; + _itemContainerGenerator.Materialized += (_, e) => OnContainersMaterialized(e); + _itemContainerGenerator.Dematerialized += (_, e) => OnContainersDematerialized(e); + _itemContainerGenerator.Recycled += (_, e) => OnContainersRecycled(e); } return _itemContainerGenerator;