Fix: Cancelation of SC event not cancelling osu map processing

Piotrekol · Aug 31, 2022 · fd7bdf0 · fd7bdf0
1 parent 87515fc
commit fd7bdf0
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/PpCalculator/PpCalculator.cs b/PpCalculator/PpCalculator.cs
@@ -227,13 +227,11 @@ private double InternalCalculate(CancellationToken cancellationToken, double? en
             if (LastMods != newMods || ResetPerformanceCalculator)
             {
                 mods = GetOsuMods(ruleset).Select(m => m.CreateInstance()).ToArray();
-                using var cts = new CancellationTokenSource(20_000);
+                using var cts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
+                cts.CancelAfter(20_000);
                 PlayableBeatmap = WorkingBeatmap.GetPlayableBeatmap(ruleset.RulesetInfo, mods, cts.Token);
-
-
                 LastMods = newMods;
                 ScoreInfo.Mods = mods;
-
                 createPerformanceCalculator = true;
             }