1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-19 09:07:18 +08:00

Change precedence order to favour playlist as a source for beatmap count

This commit is contained in:
Dean Herbert 2022-02-22 15:15:57 +09:00
parent 113153e6a3
commit cde3d9c08b

View File

@ -1,6 +1,7 @@
// 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.
using System.Linq;
using Humanizer;
using osu.Framework.Allocation;
using osu.Framework.Extensions.LocalisationExtensions;
@ -46,7 +47,11 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
private void updateCount()
{
int activeItems = PlaylistItemStats.Value?.CountActive ?? Playlist.Count;
int activeItems = Playlist.Count > 0 || PlaylistItemStats.Value == null
// For now, use the playlist as the source of truth if it has any items.
// This allows the count to display correctly on the room screen (after joining a room).
? Playlist.Count(i => !i.Expired)
: PlaylistItemStats.Value.CountActive;
count.Clear();
count.AddText(activeItems.ToLocalisableString(), s => s.Font = s.Font.With(weight: FontWeight.Bold));