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

Fix possible nullref when exiting song select too fast

Browse Source
This commit is contained in:
smoogipoo 2021-06-08 17:03:46 +09:00
parent e3cb6f45f5
commit 7fa0ac6ed7
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/Navigation/TestSceneScreenNavigation.cs
View File

@ -152,6 +152,14 @@ namespace osu.Game.Tests.Visual.Navigation
AddUntilStep("wait for track", () => !Game.MusicController.CurrentTrack.IsDummyDevice && Game.MusicController.IsPlaying); AddUntilStep("wait for track", () => !Game.MusicController.CurrentTrack.IsDummyDevice && Game.MusicController.IsPlaying);
} }
[Test]
public void TestPushSongSelectAndPressBackButtonImmediately()
{
AddStep("push song select", () => Game.ScreenStack.Push(new TestPlaySongSelect()));
AddStep("press back button", () => Game.ChildrenOfType<BackButton>().First().Action());
AddWaitStep("wait two frame", 2);
}
[Test] [Test]
public void TestExitSongSelectWithClick() public void TestExitSongSelectWithClick()
{ {

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

@ -665,7 +665,7 @@ namespace osu.Game.Screens.Select
public override bool OnBackButton() public override bool OnBackButton()
{ {
if (ModSelect.State.Value == Visibility.Visible) if (ModSelect?.State.Value == Visibility.Visible)
{ {
ModSelect.Hide(); ModSelect.Hide();
return true; return true;