RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix song select backround not being exited in time

This commit is contained in:
David Zhao 2019-02-25 18:40:19 +09:00
parent 31bbefb9a8
commit ad1bce3585
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,7 +285,7 @@ protected virtual void ExitFromBack()
public void Edit(BeatmapInfo beatmap = null)
{
Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap ?? beatmapNoDebounce);
Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap ?? beatmapNoDebounce);
this.Push(new Editor());
}
@ -510,14 +510,17 @@ public override void OnSuspending(IScreen next)
public override bool OnExiting(IScreen next)
{
if (base.OnExiting(next))
return true;
Logger.Log("Exiting song select!");
if (ModSelect.State == Visibility.Visible)
{
ModSelect.Hide();
return true;
}
FinaliseSelection(performStartAction: false);
beatmapInfoWedge.State = Visibility.Hidden;
this.FadeOut(100);
@ -530,7 +533,7 @@ public override bool OnExiting(IScreen next)
SelectedMods.UnbindAll();
Beatmap.Value.Mods.Value = new Mod[] { };
return base.OnExiting(next);
return false;
}
protected override void Dispose(bool isDisposing)