From 45636ce04b224ca516b798c253f2289c357aaa5c Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 26 Jan 2022 18:25:27 +0900
Subject: [PATCH] Remove collection `ToLive` helper method to avoid confusion

---
 osu.Game/Database/RealmObjectExtensions.cs     |  6 ------
 .../Overlays/Settings/Sections/SkinSection.cs  | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Database/RealmObjectExtensions.cs b/osu.Game/Database/RealmObjectExtensions.cs
index dba8633f53..7a0ca2c85a 100644
--- a/osu.Game/Database/RealmObjectExtensions.cs
+++ b/osu.Game/Database/RealmObjectExtensions.cs
@@ -216,12 +216,6 @@ namespace osu.Game.Database
             return new RealmLiveUnmanaged<T>(realmObject);
         }
 
-        public static List<Live<T>> ToLive<T>(this IEnumerable<T> realmList, RealmAccess realm)
-            where T : RealmObject, IHasGuidPrimaryKey
-        {
-            return realmList.Select(l => new RealmLive<T>(l, realm)).Cast<Live<T>>().ToList();
-        }
-
         public static Live<T> ToLive<T>(this T realmObject, RealmAccess realm)
             where T : RealmObject, IHasGuidPrimaryKey
         {
diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 441a439596..1dfe49945f 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -42,7 +42,7 @@ namespace osu.Game.Overlays.Settings.Sections
             Name = "<Random Skin>",
         }.ToLiveUnmanaged();
 
-        private List<Live<SkinInfo>> skinItems;
+        private readonly List<Live<SkinInfo>> dropdownItems = new List<Live<SkinInfo>>();
 
         [Resolved]
         private SkinManager skins { get; set; }
@@ -111,19 +111,23 @@ namespace osu.Game.Overlays.Settings.Sections
             configBindable.Value = skin.NewValue.ID.ToString();
         }
 
-        private void skinsChanged(IRealmCollection<SkinInfo> skins, ChangeSet changes, Exception error)
+        private void skinsChanged(IRealmCollection<SkinInfo> sender, ChangeSet changes, Exception error)
         {
             // This can only mean that realm is recycling, else we would see the protected skins.
             // Because we are using `Live<>` in this class, we don't need to worry about this scenario too much.
-            if (!skins.Any())
+            if (!sender.Any())
                 return;
 
-            int protectedCount = skins.Count(s => s.Protected);
+            int protectedCount = sender.Count(s => s.Protected);
 
-            skinItems = skins.ToLive(realm);
-            skinItems.Insert(protectedCount, random_skin_info);
+            // For simplicity repopulate the full list.
+            // In the future we should change this to properly handle ChangeSet events.
+            dropdownItems.Clear();
+            foreach (var skin in sender)
+                dropdownItems.Add(skin.ToLive(realm));
+            dropdownItems.Insert(protectedCount, random_skin_info);
 
-            skinDropdown.Items = skinItems;
+            skinDropdown.Items = dropdownItems;
 
             updateSelectedSkinFromConfig();
         }