Merge pull request #32192 from smoogipoo/more-beatmap-load-cancellations

Cancel beatmap load in more loops

Author: peppy

osu.Game/Rulesets/Objects/HitObject.cs

@@ -104,6 +104,8 @@ public IList<HitSampleInfo> Samples
         /// <param name="cancellationToken">The cancellation token.</param>
         public void ApplyDefaults(ControlPointInfo controlPointInfo, IBeatmapDifficultyInfo difficulty, CancellationToken cancellationToken = default)
         {
+            cancellationToken.ThrowIfCancellationRequested();
+
             ApplyDefaultsToSelf(controlPointInfo, difficulty);
 
             nestedHitObjects.Clear();
@@ -114,6 +116,8 @@ public void ApplyDefaults(ControlPointInfo controlPointInfo, IBeatmapDifficultyI
             {
                 foreach (HitObject hitObject in nestedHitObjects)
                 {
+                    cancellationToken.ThrowIfCancellationRequested();
+
                     if (hitObject is IHasComboInformation n)
                     {
                         n.ComboIndexBindable.BindTo(hasCombo.ComboIndexBindable);

osu.Game/Rulesets/Objects/SliderEventGenerator.cs

@@ -46,6 +46,8 @@ public static IEnumerable<SliderEventDescriptor> Generate(double startTime, doub
 
             for (int span = 0; span < spanCount; span++)
             {
+                cancellationToken.ThrowIfCancellationRequested();
+
                 double spanStartTime = startTime + span * spanDuration;
                 bool reversed = span % 2 == 1;