h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 11:33:22 +08:00
Code Issues Releases Wiki Activity

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

Browse Source 
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
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);

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

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