sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-05 12:57:39 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1041 from peppy/fix-carousel-debounce-race

Browse Source 
Fix carousel filter debounce causing a race condition
This commit is contained in:
Dean Herbert 2017-07-21 17:57:47 +09:00 committed by GitHub
commit d344452e9b
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -232,6 +232,12 @@ namespace osu.Game.Screens.Select
public bool AllowSelection = true; public bool AllowSelection = true;
public void FlushPendingFilters()
{
if (filterTask?.Completed == false)
Filter(null, false);
}
public void Filter(FilterCriteria newCriteria = null, bool debounce = true) public void Filter(FilterCriteria newCriteria = null, bool debounce = true)
{ {
if (newCriteria != null) if (newCriteria != null)
@ -263,6 +269,8 @@ namespace osu.Game.Screens.Select
}; };
filterTask?.Cancel(); filterTask?.Cancel();
filterTask = null;
if (debounce) if (debounce)
filterTask = Scheduler.AddDelayed(perform, 250); filterTask = Scheduler.AddDelayed(perform, 250);
else else

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

@ -198,13 +198,15 @@ namespace osu.Game.Screens.Select
private void carouselRaisedStart() private void carouselRaisedStart()
{ {
var pendingSelection = selectionChangedDebounce; // if we have a pending filter operation, we want to run it now.
selectionChangedDebounce = null; // it could change selection (ie. if the ruleset has been changed).
carousel.FlushPendingFilters();
if (pendingSelection?.Completed == false) if (selectionChangedDebounce?.Completed == false)
{ {
pendingSelection.RunTask(); selectionChangedDebounce.RunTask();
pendingSelection.Cancel(); // cancel the already scheduled task. selectionChangedDebounce.Cancel(); // cancel the already scheduled task.
selectionChangedDebounce = null;
} }
OnSelected(); OnSelected();