From 9dd6fc8832a14805dde6e2a6feed1bc7a2ea3b8a Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 28 Sep 2018 11:10:15 -0400 Subject: [PATCH] fix CollectionHelper.sync_with_never_duplicate --- src/client/spark/core/Utility/CollectionHelper.cs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/client/spark/core/Utility/CollectionHelper.cs b/src/client/spark/core/Utility/CollectionHelper.cs index 1b83ea870..fa96a7f15 100644 --- a/src/client/spark/core/Utility/CollectionHelper.cs +++ b/src/client/spark/core/Utility/CollectionHelper.cs @@ -1,5 +1,4 @@ using System; -using System.Collections; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; @@ -14,16 +13,13 @@ namespace mbts.utils { public static void sync_with_never_duplicate(ObservableCollection dest, IEnumerable src, IEqualityComparer comp) { int i = 0; foreach (var val in src.empty_if_null()) { - int curr_index = dest.TakeWhile(dval => !comp.Equals(dval, val)).Count(); - if (curr_index == dest.Count) { - dest.Add(val); - } else if (curr_index == i) { + int curr_index = dest.IndexOf(val); + if (curr_index == i) { continue; - } else if (curr_index < dest.Count) { + } else if (curr_index > 0 && curr_index < dest.Count) { dest.RemoveAt(curr_index); - dest.Insert(i, val); } - ++i; + dest.Insert(i++, val); } }