Applied suggested changes

This commit is contained in:
MrTheMake
2017-06-19 18:06:39 +02:00
parent aec46a57c8
commit 667e6a2d6b
7 changed files with 27 additions and 14 deletions

View File

@ -36,13 +36,11 @@ namespace osu.Game.Overlays.Music
private readonly Bindable<WorkingBeatmap> beatmapBacking = new Bindable<WorkingBeatmap>();
private readonly Bindable<OsuScreen> currentScreenBacking = new Bindable<OsuScreen>();
public bool AllowBeatmapChange = true;
public IEnumerable<BeatmapSetInfo> BeatmapSets;
private InputManager inputManager;
private bool canBeatmapChange => currentScreenBacking.Value?.CanBeatmapChange != false;
[BackgroundDependencyLoader]
private void load(OsuGameBase game, BeatmapDatabase beatmaps, OsuColour colours, UserInputManager inputManager)
{
@ -91,7 +89,6 @@ namespace osu.Game.Overlays.Music
list.BeatmapSets = BeatmapSets = beatmaps.GetAllWithChildren<BeatmapSetInfo>().ToList();
beatmapBacking.BindTo(game.Beatmap);
currentScreenBacking.BindTo(game.CurrentScreen);
filter.Search.OnCommit = (sender, newText) => {
var beatmap = list.FirstVisibleSet?.Beatmaps?.FirstOrDefault();
@ -158,7 +155,7 @@ namespace osu.Game.Overlays.Music
private void playSpecified(BeatmapInfo info)
{
if (!canBeatmapChange)
if (!AllowBeatmapChange)
{
beatmapBacking.Value?.Track?.Seek(0);
return;