h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 11:22:55 +08:00
Code Issues Releases Wiki Activity

Allow null tracker in lounge screen for tests

Browse Source
This commit is contained in:
Bartłomiej Dach 2020-12-28 22:54:52 +01:00
parent 6dc0f6af50
commit 540dec2e7c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
[Resolved]
private MusicController music { get; set; }
[Resolved]
[Resolved(CanBeNull = true)]
private OngoingOperationTracker joiningRoomTracker { get; set; }
[BackgroundDependencyLoader]
@ -102,8 +102,11 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
initialRoomsReceived.BindTo(RoomManager.InitialRoomsReceived);
initialRoomsReceived.BindValueChanged(_ => updateLoadingLayer());
joiningRoom.BindTo(joiningRoomTracker.InProgress);
joiningRoom.BindValueChanged(_ => updateLoadingLayer(), true);
if (joiningRoomTracker != null)
{
joiningRoom.BindTo(joiningRoomTracker.InProgress);
joiningRoom.BindValueChanged(_ => updateLoadingLayer(), true);
}
}
protected override void UpdateAfterChildren()
@ -161,15 +164,15 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
private void joinRequested(Room room)
{
joiningRoomTracker.BeginOperation();
joiningRoomTracker?.BeginOperation();
RoomManager?.JoinRoom(room, r =>
{
Open(room);
joiningRoomTracker.EndOperation();
joiningRoomTracker?.EndOperation();
}, _ =>
{
joiningRoomTracker.EndOperation();
joiningRoomTracker?.EndOperation();
});
}