h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 20:47:22 +08:00
Code Issues Releases Wiki Activity

Fix home button being cancelled by mod select

Browse Source
This commit is contained in:
Dean Herbert 2018-12-04 12:06:05 +09:00
parent b0adab5f96
commit a33865efce
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -85,6 +85,14 @@ namespace osu.Game.Screens.Select
} }
} }
protected override void ExitFromBack()
{
if (modSelect.State == Visibility.Visible)
modSelect.Hide();
base.ExitFromBack();
}
protected override void UpdateBeatmap(WorkingBeatmap beatmap) protected override void UpdateBeatmap(WorkingBeatmap beatmap)
{ {
beatmap.Mods.BindTo(selectedMods); beatmap.Mods.BindTo(selectedMods);
@ -124,12 +132,6 @@ namespace osu.Game.Screens.Select
protected override bool OnExiting(Screen next) protected override bool OnExiting(Screen next)
{ {
if (modSelect.State == Visibility.Visible)
{
modSelect.Hide();
return true;
}
if (base.OnExiting(next)) if (base.OnExiting(next))
return true; return true;

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

@ -191,13 +191,15 @@ namespace osu.Game.Screens.Select
}); });
Add(Footer = new Footer Add(Footer = new Footer
{ {
OnBack = Exit, OnBack = ExitFromBack,
}); });
FooterPanels.Add(BeatmapOptions = new BeatmapOptionsOverlay()); FooterPanels.Add(BeatmapOptions = new BeatmapOptionsOverlay());
} }
} }
protected virtual void ExitFromBack() => Exit();
[BackgroundDependencyLoader(true)] [BackgroundDependencyLoader(true)]
private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuColour colours) private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuColour colours)
{ {