From c22bffaa012ed7750c011fc3796e9ef6d997786b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 8 Jun 2022 19:30:18 +0900 Subject: [PATCH] Fix filter failure when no collection is selected --- osu.Game/Overlays/Music/Playlist.cs | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/osu.Game/Overlays/Music/Playlist.cs b/osu.Game/Overlays/Music/Playlist.cs index 4653a65041..1d8163b57b 100644 --- a/osu.Game/Overlays/Music/Playlist.cs +++ b/osu.Game/Overlays/Music/Playlist.cs @@ -31,20 +31,25 @@ namespace osu.Game.Overlays.Music foreach (var item in items.OfType()) { - var beatmapHashes = item.Model.Value.Beatmaps.Select(b => b.MD5Hash); - - bool contained = false; - - foreach (string hash in beatmapHashes) + if (criteria.Collection == null) + item.InSelectedCollection = true; + else { - if (criteria.Collection?.Beatmaps.Contains(hash) == true) - { - contained = true; - break; - } - } + var beatmapHashes = item.Model.Value.Beatmaps.Select(b => b.MD5Hash); - item.InSelectedCollection = contained; + bool contained = false; + + foreach (string hash in beatmapHashes) + { + if (criteria.Collection?.Beatmaps.Contains(hash) == true) + { + contained = true; + break; + } + } + + item.InSelectedCollection = contained; + } } items.SearchTerm = criteria.SearchText;