h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 00:42:55 +08:00
Code Issues Releases Wiki Activity

Move IsLoaded check inside BeatmapCarousel

Browse Source
This commit is contained in:
Dean Herbert 2023-01-18 12:00:47 +09:00
parent 8e1002b744
commit 4ad79a8a0a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

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

9
osu.Game/Screens/Select/SongSelect.cs
View File

@ -860,12 +860,9 @@ namespace osu.Game.Screens.Select
Logger.Log($"decoupled ruleset transferred (\"{decoupledRuleset.Value}\" -> \"{Ruleset.Value}\")"); Logger.Log($"decoupled ruleset transferred (\"{decoupledRuleset.Value}\" -> \"{Ruleset.Value}\")");
rulesetNoDebounce = 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).
// if we have a pending filter operation, we want to run it now. Carousel.FlushPendingFilterOperations();
// it could change selection (ie. if the ruleset has been changed).
Carousel.FlushPendingFilterOperations();
}
return true; return true;
} }