h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-14 02:43:02 +08:00
Code Issues Releases Wiki Activity

Close mod select before exiting song selection

Browse Source
This commit is contained in:
smoogipoo 2019-06-25 17:27:13 +09:00
parent d9927204f8
commit 1a26608ba9
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -274,17 +274,6 @@ namespace osu.Game.Screens.Select
return dependencies; return dependencies;
} }
protected virtual void ExitFromBack()
{
if (ModSelect.State.Value == Visibility.Visible)
{
ModSelect.Hide();
return;
}
this.Exit();
}
public void Edit(BeatmapInfo beatmap = null) public void Edit(BeatmapInfo beatmap = null)
{ {
Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap ?? beatmapNoDebounce); Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmap ?? beatmapNoDebounce);
@ -515,6 +504,12 @@ namespace osu.Game.Screens.Select
public override bool OnExiting(IScreen next) public override bool OnExiting(IScreen next)
{ {
if (ModSelect.State.Value == Visibility.Visible)
{
ModSelect.Hide();
return true;
}
if (base.OnExiting(next)) if (base.OnExiting(next))
return true; return true;