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

Merge branch 'master' into legacy-beatmap-combo-offset

Browse Source
This commit is contained in:
Dean Herbert
2021-07-20 19:49:35 +09:00
committed by GitHub
parent a1001542f3 d066ebcd70
commit 3a974d5027
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
osu.Game.Tests/Visual/Multiplayer/TestSceneMultiplayer.cs
View File

@ -104,6 +104,36 @@ namespace osu.Game.Tests.Visual.Multiplayer
}); });
} }
[Test]
public void TestExitMidJoin()
{
Room room = null;
AddStep("create room", () =>
{
room = new Room
{
Name = { Value = "Test Room" },
Playlist =
{
new PlaylistItem
{
Beatmap = { Value = beatmaps.GetWorkingBeatmap(importedSet.Beatmaps.First(b => b.RulesetID == 0)).BeatmapInfo },
Ruleset = { Value = new OsuRuleset().RulesetInfo },
}
}
};
});
AddStep("refresh rooms", () => multiplayerScreen.RoomManager.Filter.Value = new FilterCriteria());
AddStep("select room", () => InputManager.Key(Key.Down));
AddStep("join room and immediately exit", () =>
{
multiplayerScreen.ChildrenOfType<LoungeSubScreen>().Single().Open(room);
Schedule(() => Stack.CurrentScreen.Exit());
});
}
[Test] [Test]
public void TestJoinRoomWithoutPassword() public void TestJoinRoomWithoutPassword()
{ {

11
osu.Game/Screens/OnlinePlay/OnlinePlayScreen.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Diagnostics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
@ -222,7 +223,9 @@ namespace osu.Game.Screens.OnlinePlay
this.FadeIn(250); this.FadeIn(250);
this.ScaleTo(1, 250, Easing.OutSine); this.ScaleTo(1, 250, Easing.OutSine);
screenStack.CurrentScreen?.OnResuming(last); Debug.Assert(screenStack.CurrentScreen != null);
screenStack.CurrentScreen.OnResuming(last);
base.OnResuming(last); base.OnResuming(last);
UpdatePollingRate(isIdle.Value); UpdatePollingRate(isIdle.Value);
@ -233,14 +236,16 @@ namespace osu.Game.Screens.OnlinePlay
this.ScaleTo(1.1f, 250, Easing.InSine); this.ScaleTo(1.1f, 250, Easing.InSine);
this.FadeOut(250); this.FadeOut(250);
screenStack.CurrentScreen?.OnSuspending(next); Debug.Assert(screenStack.CurrentScreen != null);
screenStack.CurrentScreen.OnSuspending(next);
UpdatePollingRate(isIdle.Value); UpdatePollingRate(isIdle.Value);
} }
public override bool OnExiting(IScreen next) public override bool OnExiting(IScreen next)
{ {
if (screenStack.CurrentScreen?.OnExiting(next) == true) var subScreen = screenStack.CurrentScreen as Drawable;
if (subScreen?.IsLoaded == true && screenStack.CurrentScreen.OnExiting(next))
return true; return true;
RoomManager.PartRoom(); RoomManager.PartRoom();