mirror of
https://github.com/ppy/osu.git
synced 2025-01-14 00:42:55 +08:00
Move IsLoaded
check inside BeatmapCarousel
This commit is contained in:
parent
8e1002b744
commit
4ad79a8a0a
@ -596,6 +596,9 @@ namespace osu.Game.Screens.Select
|
||||
|
||||
public void FlushPendingFilterOperations()
|
||||
{
|
||||
if (!IsLoaded)
|
||||
return;
|
||||
|
||||
if (PendingFilter?.Completed == false)
|
||||
{
|
||||
applyActiveCriteria(false);
|
||||
|
@ -860,12 +860,9 @@ namespace osu.Game.Screens.Select
|
||||
Logger.Log($"decoupled ruleset transferred (\"{decoupledRuleset.Value}\" -> \"{Ruleset.Value}\")");
|
||||
rulesetNoDebounce = decoupledRuleset.Value = Ruleset.Value;
|
||||
|
||||
if (Carousel.IsLoaded)
|
||||
{
|
||||
// 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();
|
||||
}
|
||||
// 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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user