From 813ff6fcea388b8081511afa53aaecd39f5e5239 Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 24 Mar 2016 17:13:10 +0100 Subject: [PATCH] Handle TreeDataTemplate.ItemsSelector == null. --- .../Generators/TreeItemContainerGenerator.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Perspex.Controls/Generators/TreeItemContainerGenerator.cs b/src/Perspex.Controls/Generators/TreeItemContainerGenerator.cs index 3dd3fa904b..cd19f53b60 100644 --- a/src/Perspex.Controls/Generators/TreeItemContainerGenerator.cs +++ b/src/Perspex.Controls/Generators/TreeItemContainerGenerator.cs @@ -77,7 +77,13 @@ namespace Perspex.Controls.Generators var result = new T(); result.SetValue(ContentProperty, template.Build(item)); - BindingOperations.Apply(result, ItemsProperty, template.ItemsSelector(item), null); + + var itemsSelector = template.ItemsSelector(item); + + if (itemsSelector != null) + { + BindingOperations.Apply(result, ItemsProperty, itemsSelector, null); + } if (!(item is IControl)) {