Fix Some Group Filter Jank

ShokoAnime · Dec 17, 2023 · c94dccc · c94dccc
1 parent ed49b6e
commit c94dccc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 16 deletions.
diff --git a/Shoko.Commons b/Shoko.Commons
diff --git a/Shoko.Desktop/ViewModel/Server/VM_GroupFilter.cs b/Shoko.Desktop/ViewModel/Server/VM_GroupFilter.cs
@@ -339,7 +339,7 @@ public bool HasGroupChilds()
 
         public List<IListWrapper> GetDirectChildren()
         {
-            Childs = Childs ?? new HashSet<int>(); //Hack around ASP Nulls.
+            Childs ??= new HashSet<int>(); //Hack around ASP Nulls.
             List<IListWrapper> wrappers = new List<IListWrapper>();
 
             VM_AnimeGroup_User.SortMethod = AnimeGroupSortMethod.SortName;

diff --git a/Shoko.Desktop/ViewModel/VM_MainListHelper.cs b/Shoko.Desktop/ViewModel/VM_MainListHelper.cs
@@ -763,23 +763,11 @@ public void UpdateAll()
                 }
 
                 //Update Group Filters
-                foreach (int gfr in changes.Filters.RemovedItems)
-                {
-                    AllGroupFiltersDictionary.Remove(gfr);
-                }
+                AllGroupFiltersDictionary.Clear();
 
                 foreach (VM_GroupFilter gf in changes.Filters.ChangedItems.CastList<VM_GroupFilter>())
                 {
-                    VM_GroupFilter v;
-
-                    if (AllGroupFiltersDictionary.TryGetValue(gf.GroupFilterID, out v))
-                    {
-                        v.Populate(gf);
-                    }
-                    else
-                    {
-                        AllGroupFiltersDictionary[gf.GroupFilterID] = gf;
-                    }
+                    AllGroupFiltersDictionary[gf.GroupFilterID] = gf;
                 }
 
                 foreach (int gf in changes.Filters.ChangedItems.Select(a => a.GroupFilterID))