From 070d156e89d55fe51566f14c8fbfbe3de0765611 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 8 Aug 2022 16:12:07 +0900
Subject: [PATCH 1/3] Simplify task logic in `ModPresetColumn`

---
 osu.Game/Overlays/Mods/ModPresetColumn.cs | 27 +++++++----------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModPresetColumn.cs b/osu.Game/Overlays/Mods/ModPresetColumn.cs
index 7f453637e7..bc0e97d77d 100644
--- a/osu.Game/Overlays/Mods/ModPresetColumn.cs
+++ b/osu.Game/Overlays/Mods/ModPresetColumn.cs
@@ -2,7 +2,6 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -50,19 +49,18 @@ namespace osu.Game.Overlays.Mods
         {
             presetSubscription?.Dispose();
             presetSubscription = realm.RegisterForNotifications(r =>
-                    r.All<ModPreset>()
-                     .Filter($"{nameof(ModPreset.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $0"
-                             + $" && {nameof(ModPreset.DeletePending)} == false", ruleset.Value.ShortName)
-                     .OrderBy(preset => preset.Name),
-                (presets, _, _) => asyncLoadPanels(presets));
+                r.All<ModPreset>()
+                 .Filter($"{nameof(ModPreset.Ruleset)}.{nameof(RulesetInfo.ShortName)} == $0"
+                         + $" && {nameof(ModPreset.DeletePending)} == false", ruleset.Value.ShortName)
+                 .OrderBy(preset => preset.Name), asyncLoadPanels);
         }
 
         private CancellationTokenSource? cancellationTokenSource;
 
         private Task? latestLoadTask;
-        internal bool ItemsLoaded => latestLoadTask == null;
+        internal bool ItemsLoaded => latestLoadTask?.IsCompleted ?? false;
 
-        private void asyncLoadPanels(IReadOnlyList<ModPreset> presets)
+        private void asyncLoadPanels(IRealmCollection<ModPreset> presets, ChangeSet changes, Exception error)
         {
             cancellationTokenSource?.Cancel();
 
@@ -72,23 +70,14 @@ namespace osu.Game.Overlays.Mods
                 return;
             }
 
-            var panels = presets.Select(preset => new ModPresetPanel(preset.ToLive(realm))
+            latestLoadTask = LoadComponentsAsync(presets.Select(p => new ModPresetPanel(p.ToLive(realm))
             {
                 Shear = Vector2.Zero
-            });
-
-            Task? loadTask;
-
-            latestLoadTask = loadTask = LoadComponentsAsync(panels, loaded =>
+            }), loaded =>
             {
                 ItemsFlow.RemoveAll(panel => panel is ModPresetPanel);
                 ItemsFlow.AddRange(loaded);
             }, (cancellationTokenSource = new CancellationTokenSource()).Token);
-            loadTask.ContinueWith(_ =>
-            {
-                if (loadTask == latestLoadTask)
-                    latestLoadTask = null;
-            });
         }
 
         protected override void Dispose(bool isDisposing)

From 00333fb0d21af61edb94812df8f9c5bd9a6de56d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 8 Aug 2022 19:19:13 +0200
Subject: [PATCH 2/3] Change `?? false` test to `== true` for legibility

---
 osu.Game/Overlays/Mods/ModPresetColumn.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/Mods/ModPresetColumn.cs b/osu.Game/Overlays/Mods/ModPresetColumn.cs
index bc0e97d77d..2b234b4319 100644
--- a/osu.Game/Overlays/Mods/ModPresetColumn.cs
+++ b/osu.Game/Overlays/Mods/ModPresetColumn.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Mods
         private CancellationTokenSource? cancellationTokenSource;
 
         private Task? latestLoadTask;
-        internal bool ItemsLoaded => latestLoadTask?.IsCompleted ?? false;
+        internal bool ItemsLoaded => latestLoadTask?.IsCompleted == true;
 
         private void asyncLoadPanels(IRealmCollection<ModPreset> presets, ChangeSet changes, Exception error)
         {

From f21a51aa247e9420c6c07d8c2bee7f2b3d626fad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Mon, 8 Aug 2022 19:20:50 +0200
Subject: [PATCH 3/3] Simplify mirror copy of task logic in `ModColumn`

---
 osu.Game/Overlays/Mods/ModColumn.cs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/osu.Game/Overlays/Mods/ModColumn.cs b/osu.Game/Overlays/Mods/ModColumn.cs
index 1c40c8c6e5..7a2c727a00 100644
--- a/osu.Game/Overlays/Mods/ModColumn.cs
+++ b/osu.Game/Overlays/Mods/ModColumn.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Overlays.Mods
         private IModHotkeyHandler hotkeyHandler = null!;
 
         private Task? latestLoadTask;
-        internal bool ItemsLoaded => latestLoadTask == null;
+        internal bool ItemsLoaded => latestLoadTask?.IsCompleted == true;
 
         public ModColumn(ModType modType, bool allowIncompatibleSelection)
         {
@@ -132,18 +132,11 @@ namespace osu.Game.Overlays.Mods
 
             var panels = availableMods.Select(mod => CreateModPanel(mod).With(panel => panel.Shear = Vector2.Zero));
 
-            Task? loadTask;
-
-            latestLoadTask = loadTask = LoadComponentsAsync(panels, loaded =>
+            latestLoadTask = LoadComponentsAsync(panels, loaded =>
             {
                 ItemsFlow.ChildrenEnumerable = loaded;
                 updateState();
             }, (cancellationTokenSource = new CancellationTokenSource()).Token);
-            loadTask.ContinueWith(_ =>
-            {
-                if (loadTask == latestLoadTask)
-                    latestLoadTask = null;
-            });
         }
 
         private void updateState()