From d9e0681ac997f7909e980e81533eb79c1d1ce440 Mon Sep 17 00:00:00 2001 From: brianlagunas_cp Date: Wed, 19 Oct 2011 15:32:14 +0000 Subject: [PATCH] Selector: fixed possible null object exception. --- .../WPFToolkit.Extended/Core/Primitives/Selector.cs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs index 18a37304..dd89a41d 100644 --- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs +++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs @@ -323,13 +323,16 @@ namespace Microsoft.Windows.Controls.Primitives { _ignoreSetSelectedValue = true; - foreach (object item in ItemsSource) + if (ItemsSource != null) { - var selectorItem = ItemContainerGenerator.ContainerFromItem(item) as SelectorItem; - if (selectorItem != null) + foreach (object item in ItemsSource) { - if (selectorItem.IsSelected) - selectorItem.IsSelected = false; + var selectorItem = ItemContainerGenerator.ContainerFromItem(item) as SelectorItem; + if (selectorItem != null) + { + if (selectorItem.IsSelected) + selectorItem.IsSelected = false; + } } }