Merge branch 'master' into fix-carousel-sort-change-after-play

This commit is contained in:
Bartłomiej Dach
2023-01-18 17:15:20 +01:00
29 changed files with 1091 additions and 225 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;
}