sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-exit-race-condition

Browse Source
This commit is contained in:
Dan Balasescu
2018-07-09 19:02:37 +09:00
committed by GitHub
parent 09b3375a9d 34db414672
commit ee4607c86e
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -235,6 +235,10 @@ namespace osu.Game.Screens.Select
/// <param name="performStartAction">Whether to trigger <see cref="OnStart"/>.</param>
public void FinaliseSelection(BeatmapInfo beatmap = null, bool performStartAction = true)
{
// avoid attempting to continue before a selection has been obtained.
// this could happen via a user interaction while the carousel is still in a loading state.
if (Carousel.SelectedBeatmap == null) return;
// 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();