Merge branch 'master' into fix-early-inactive-pause

This commit is contained in:
Dean Herbert
2017-05-19 16:21:20 +09:00
committed by GitHub
3 changed files with 14 additions and 10 deletions

View File

@ -26,6 +26,7 @@ namespace osu.Game.Database
public string[] SearchableTerms => new[]
{
Author,
Artist,
ArtistUnicode,
Title,

View File

@ -198,8 +198,11 @@ namespace osu.Game.Screens.Select
var pendingSelection = selectionChangedDebounce;
selectionChangedDebounce = null;
pendingSelection?.RunTask();
pendingSelection?.Cancel(); // cancel the already scheduled task.
if (pendingSelection?.Completed == false)
{
pendingSelection?.RunTask();
pendingSelection?.Cancel(); // cancel the already scheduled task.
}
if (Beatmap == null) return;