diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs index 50788a2fc2..7ba9382f65 100644 --- a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs +++ b/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs @@ -137,7 +137,7 @@ namespace osu.Game.Screens.Multi.Lounge currentRoom.Value = room; - this.Push(new MatchSubScreen(s => pushGameplayScreen?.Invoke(s))); + this.Push(new MatchSubScreen(room, s => pushGameplayScreen?.Invoke(s))); } } } diff --git a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs index adfd77c182..7b94de7d76 100644 --- a/osu.Game/Screens/Multi/Match/MatchSubScreen.cs +++ b/osu.Game/Screens/Multi/Match/MatchSubScreen.cs @@ -23,7 +23,7 @@ namespace osu.Game.Screens.Multi.Match { public override bool AllowBeatmapRulesetChange => false; - public override string Title => roomId?.Value == null ? "New room" : name.Value; + public override string Title { get; } public override string ShortTitle => "room"; @@ -36,8 +36,10 @@ namespace osu.Game.Screens.Multi.Match [Resolved(typeof(Room), nameof(Room.Playlist))] private BindableList playlist { get; set; } - public MatchSubScreen(Action pushGameplayScreen) + public MatchSubScreen(Room room, Action pushGameplayScreen) { + Title = room.RoomID.Value == null ? "New room" : room.Name; + InternalChild = new Match(pushGameplayScreen) { RelativeSizeAxes = Axes.Both,