h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 14:42:56 +08:00
Code Issues Releases Wiki Activity

remove hacky method to check if carousel is null

Browse Source
This commit is contained in:
mk56-spn 2023-01-15 15:32:53 +01:00
parent c5775aa452
commit 9a29c9ae26
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Screens/Select/SongSelect.cs
View File

@ -128,7 +128,7 @@ namespace osu.Game.Screens.Select
private void load(AudioManager audio, OsuColour colours, ManageCollectionsDialog? manageCollectionsDialog, DifficultyRecommender? recommender)
{
// initial value transfer is required for FilterControl (it uses our re-cached bindables in its async load for the initial filter).
transferRulesetValue(false);
transferRulesetValue();
LoadComponentAsync(Carousel = new BeatmapCarousel
{
@ -852,7 +852,7 @@ namespace osu.Game.Screens.Select
/// Will immediately run filter operations if required.
/// </summary>
/// <returns>Whether a transfer occurred.</returns>
private bool transferRulesetValue(bool carouselLoaded = true)
private bool transferRulesetValue()
{
if (decoupledRuleset.Value?.Equals(Ruleset.Value) == true)
return false;
@ -860,8 +860,8 @@ namespace osu.Game.Screens.Select
Logger.Log($"decoupled ruleset transferred (\"{decoupledRuleset.Value}\" -> \"{Ruleset.Value}\")");
rulesetNoDebounce = decoupledRuleset.Value = Ruleset.Value;
// We don't want to declare the carousel as nullable, so this check allows us to avoid running the carousel flush during the loading process
if (!carouselLoaded) return true;
// We want to check for null since this method gets called before the loading of the carousel.
if (Carousel.IsNull()) return true;
// if we have a pending filter operation, we want to run it now.
// it could change selection (ie. if the ruleset has been changed).