mirror of
https://github.com/ppy/osu.git
synced 2026-06-02 02:29:54 +08:00
Merge pull request #32192 from smoogipoo/more-beatmap-load-cancellations
Cancel beatmap load in more loops
This commit is contained in:
@@ -104,6 +104,8 @@ namespace osu.Game.Rulesets.Objects
|
||||
/// <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 @@ namespace osu.Game.Rulesets.Objects
|
||||
{
|
||||
foreach (HitObject hitObject in nestedHitObjects)
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
if (hitObject is IHasComboInformation n)
|
||||
{
|
||||
n.ComboIndexBindable.BindTo(hasCombo.ComboIndexBindable);
|
||||
|
||||
@@ -46,6 +46,8 @@ namespace osu.Game.Rulesets.Objects
|
||||
|
||||
for (int span = 0; span < spanCount; span++)
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
double spanStartTime = startTime + span * spanDuration;
|
||||
bool reversed = span % 2 == 1;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user