Selector: fixed possible null object exception.

15 years ago · d9e0681ac9
1 changed files with 8 additions and 5 deletions
--- 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;
+                    }
                }
            }