sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-29 07:07:55 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix song select backround not being exited in time

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