1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 11:35:35 +08:00

Merge pull request #22261 from peppy/fix-bad-operation

Fix song select potentially operating on `Carousel` before it is fully loaded
This commit is contained in:
Dean Herbert 2023-01-18 12:06:33 +09:00 committed by GitHub
commit 736ff419c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions

View File

@ -596,6 +596,9 @@ namespace osu.Game.Screens.Select
public void FlushPendingFilterOperations()
{
if (!IsLoaded)
return;
if (PendingFilter?.Completed == false)
{
applyActiveCriteria(false);

View File

@ -863,6 +863,7 @@ namespace osu.Game.Screens.Select
// if we have a pending filter operation, we want to run it now.
// it could change selection (ie. if the ruleset has been changed).
Carousel.FlushPendingFilterOperations();
return true;
}