diff --git a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs index d68de88ad..e0e9dec8c 100644 --- a/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs +++ b/src/client/spark/view/Controls/DataGridEx/Filters/VM/DiscreteValuesFilterVM.cs @@ -110,7 +110,7 @@ namespace mbts.spark.filters { selected_items.CollectionChanged += on_selected_items_CollectionChanged; Action>>> ah = cb => _on_state_loaded += cb, rh = cb => _on_state_loaded -= cb; _resources.Add(Observable.FromEvent(ah, rh).SelectMany(src => src).ObserveOnDispatcher().Subscribe(dsi => { - if (!_override_desired_selection) { + if (!_override_desired_selection && dsi != null) { var copy = new HashSet(_selected_items_set, equality_comparer); _selected_items_set = new HashSet(dsi, equality_comparer); using (selected_items.SuspendHandler(on_selected_items_CollectionChanged)) {