Fixed NullReference

Softeq · Sep 24, 2024 · 55eee72 · 55eee72
1 parent 134f5ec
commit 55eee72
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Softeq.XToolkit.Bindings.Droid/Bindable/BindableRecyclerViewAdapter.cs b/Softeq.XToolkit.Bindings.Droid/Bindable/BindableRecyclerViewAdapter.cs
@@ -13,6 +13,7 @@
 using Softeq.XToolkit.Common.Collections;
 using Softeq.XToolkit.Common.Collections.EventArgs;
 using Softeq.XToolkit.Common.Commands;
+using Softeq.XToolkit.Common.Extensions;
 using Softeq.XToolkit.Common.Weak;
 
 #nullable disable
@@ -108,7 +109,9 @@ public sealed override RecyclerView.ViewHolder OnCreateViewHolder(ViewGroup pare
 
         public void DoAttachBindings()
         {
-            _existingBindableViewHolders.ForEach(x => x.DoAttachBindings());
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+            _existingBindableViewHolders.Where(x => x.DataContext != null)
+                .Apply(x => x.DoAttachBindings());
         }
 
         public void DoDetachBindings()