From 18e6afbec06a2111275ba6415eb7d132f52f9ce2 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 29 Jan 2021 19:16:10 +0900
Subject: [PATCH] Ensure the item is present before trying to select it

---
 .../Overlays/Settings/Sections/SkinSection.cs | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Settings/Sections/SkinSection.cs b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
index 56c677d5b5..7c8309fd56 100644
--- a/osu.Game/Overlays/Settings/Sections/SkinSection.cs
+++ b/osu.Game/Overlays/Settings/Sections/SkinSection.cs
@@ -121,7 +121,22 @@ namespace osu.Game.Overlays.Settings.Sections
             });
         }
 
-        private void updateSelectedSkinFromConfig() => dropdownBindable.Value = skinDropdown.Items.Single(s => s.ID == configBindable.Value);
+        private void updateSelectedSkinFromConfig()
+        {
+            int id = configBindable.Value;
+
+            var skin = skinDropdown.Items.FirstOrDefault(s => s.ID == id);
+
+            if (skin == null)
+            {
+                // there may be a thread race condition where an item is selected that hasn't yet been added to the dropdown.
+                // to avoid adding complexity, let's just ensure the item is added so we can perform the selection.
+                skin = skins.Query(s => s.ID == id);
+                addItem(skin);
+            }
+
+            dropdownBindable.Value = skin;
+        }
 
         private void updateItems()
         {
@@ -134,14 +149,14 @@ namespace osu.Game.Overlays.Settings.Sections
         private void itemUpdated(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)
         {
             if (weakItem.NewValue.TryGetTarget(out var item))
-            {
-                Schedule(() =>
-                {
-                    List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
-                    sortUserSkins(newDropdownItems);
-                    skinDropdown.Items = newDropdownItems;
-                });
-            }
+                Schedule(() => addItem(item));
+        }
+
+        private void addItem(SkinInfo item)
+        {
+            List<SkinInfo> newDropdownItems = skinDropdown.Items.Where(i => !i.Equals(item)).Append(item).ToList();
+            sortUserSkins(newDropdownItems);
+            skinDropdown.Items = newDropdownItems;
         }
 
         private void itemRemoved(ValueChangedEvent<WeakReference<SkinInfo>> weakItem)