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

Remove loadedTestBeatmaps flag

Browse Source
This commit is contained in:
Dean Herbert 2024-08-28 20:06:44 +09:00
parent e04b5bb3f2
commit 1776d38809
No known key found for this signature in database
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Screens/Select/BeatmapCarousel.cs
View File

@ -116,15 +116,12 @@ namespace osu.Game.Screens.Select
[Resolved] [Resolved]
private DetachedBeatmapStore? detachedBeatmapStore { get; set; } private DetachedBeatmapStore? detachedBeatmapStore { get; set; }
private IBindableList<BeatmapSetInfo> detachedBeatmapSets = null!; private IBindableList<BeatmapSetInfo>? detachedBeatmapSets;
private readonly NoResultsPlaceholder noResultsPlaceholder; private readonly NoResultsPlaceholder noResultsPlaceholder;
private IEnumerable<CarouselBeatmapSet> beatmapSets => root.Items.OfType<CarouselBeatmapSet>(); private IEnumerable<CarouselBeatmapSet> beatmapSets => root.Items.OfType<CarouselBeatmapSet>();
// todo: only used for testing, maybe remove.
private bool loadedTestBeatmaps;
public IEnumerable<BeatmapSetInfo> BeatmapSets public IEnumerable<BeatmapSetInfo> BeatmapSets
{ {
get => beatmapSets.Select(g => g.BeatmapSet); get => beatmapSets.Select(g => g.BeatmapSet);
@ -133,7 +130,6 @@ namespace osu.Game.Screens.Select
if (LoadState != LoadState.NotLoaded) if (LoadState != LoadState.NotLoaded)
throw new InvalidOperationException("If not using a realm source, beatmap sets must be set before load."); throw new InvalidOperationException("If not using a realm source, beatmap sets must be set before load.");
loadedTestBeatmaps = true;
detachedBeatmapSets = new BindableList<BeatmapSetInfo>(value); detachedBeatmapSets = new BindableList<BeatmapSetInfo>(value);
Schedule(loadNewRoot); Schedule(loadNewRoot);
} }
@ -143,7 +139,7 @@ namespace osu.Game.Screens.Select
{ {
// Ensure no changes are made to the list while we are initialising items. // Ensure no changes are made to the list while we are initialising items.
// We'll catch up on changes via subscriptions anyway. // We'll catch up on changes via subscriptions anyway.
BeatmapSetInfo[] loadableSets = detachedBeatmapSets.ToArray(); BeatmapSetInfo[] loadableSets = detachedBeatmapSets!.ToArray();
if (selectedBeatmapSet != null && !loadableSets.Contains(selectedBeatmapSet.BeatmapSet)) if (selectedBeatmapSet != null && !loadableSets.Contains(selectedBeatmapSet.BeatmapSet))
selectedBeatmapSet = null; selectedBeatmapSet = null;
@ -256,7 +252,7 @@ namespace osu.Game.Screens.Select
RightClickScrollingEnabled.ValueChanged += enabled => Scroll.RightMouseScrollbar = enabled.NewValue; RightClickScrollingEnabled.ValueChanged += enabled => Scroll.RightMouseScrollbar = enabled.NewValue;
RightClickScrollingEnabled.TriggerChange(); RightClickScrollingEnabled.TriggerChange();
if (!loadedTestBeatmaps && detachedBeatmapStore != null) if (detachedBeatmapStore != null && detachedBeatmapSets == null)
{ {
// This is performing an unnecessary second lookup on realm (in addition to the subscription), but for performance reasons // This is performing an unnecessary second lookup on realm (in addition to the subscription), but for performance reasons
// we require it to be separate: the subscription's initial callback (with `ChangeSet` of `null`) will run on the update // we require it to be separate: the subscription's initial callback (with `ChangeSet` of `null`) will run on the update
@ -279,10 +275,6 @@ namespace osu.Game.Screens.Select
private void beatmapSetsChanged(object? beatmaps, NotifyCollectionChangedEventArgs changed) private void beatmapSetsChanged(object? beatmaps, NotifyCollectionChangedEventArgs changed)
{ {
// If loading test beatmaps, avoid overwriting with realm subscription callbacks.
if (loadedTestBeatmaps)
return;
IEnumerable<BeatmapSetInfo>? newBeatmapSets = changed.NewItems?.Cast<BeatmapSetInfo>(); IEnumerable<BeatmapSetInfo>? newBeatmapSets = changed.NewItems?.Cast<BeatmapSetInfo>();
switch (changed.Action) switch (changed.Action)