From 32c77ddf717842f33a143310ce951d9ffbd014da Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 8 Jul 2022 15:07:30 +0900
Subject: [PATCH] Avoid triggering `SeasonalBackgroundChanged` unless actually
 required

---
 .../Backgrounds/SeasonalBackgroundLoader.cs   | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
index bfea3a722c..99af95b5fe 100644
--- a/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
+++ b/osu.Game/Graphics/Backgrounds/SeasonalBackgroundLoader.cs
@@ -38,19 +38,21 @@ namespace osu.Game.Graphics.Backgrounds
         private void load(OsuConfigManager config, SessionStatics sessionStatics)
         {
             seasonalBackgroundMode = config.GetBindable<SeasonalBackgroundMode>(OsuSetting.SeasonalBackgroundMode);
-            seasonalBackgroundMode.BindValueChanged(_ => SeasonalBackgroundChanged?.Invoke());
+            seasonalBackgroundMode.BindValueChanged(_ => triggerSeasonalBackgroundChanged());
 
             seasonalBackgrounds = sessionStatics.GetBindable<APISeasonalBackgrounds>(Static.SeasonalBackgrounds);
-            seasonalBackgrounds.BindValueChanged(response =>
-            {
-                if (response.NewValue?.Backgrounds?.Count > 0)
-                    SeasonalBackgroundChanged?.Invoke();
-            });
+            seasonalBackgrounds.BindValueChanged(_ => triggerSeasonalBackgroundChanged());
 
             apiState.BindTo(api.State);
             apiState.BindValueChanged(fetchSeasonalBackgrounds, true);
         }
 
+        private void triggerSeasonalBackgroundChanged()
+        {
+            if (shouldShowSeasonal)
+                SeasonalBackgroundChanged?.Invoke();
+        }
+
         private void fetchSeasonalBackgrounds(ValueChangedEvent<APIState> stateChanged)
         {
             if (seasonalBackgrounds.Value != null || stateChanged.NewValue != APIState.Online)
@@ -68,15 +70,10 @@ namespace osu.Game.Graphics.Backgrounds
 
         public SeasonalBackground LoadNextBackground()
         {
-            if (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Never
-                || (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Sometimes && !isInSeason))
-            {
+            if (!shouldShowSeasonal)
                 return null;
-            }
 
-            var backgrounds = seasonalBackgrounds.Value?.Backgrounds;
-            if (backgrounds == null || !backgrounds.Any())
-                return null;
+            var backgrounds = seasonalBackgrounds.Value.Backgrounds;
 
             current = (current + 1) % backgrounds.Count;
             string url = backgrounds[current].Url;
@@ -84,6 +81,20 @@ namespace osu.Game.Graphics.Backgrounds
             return new SeasonalBackground(url);
         }
 
+        private bool shouldShowSeasonal
+        {
+            get
+            {
+                if (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Never)
+                    return false;
+
+                if (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Sometimes && !isInSeason)
+                    return false;
+
+                return seasonalBackgrounds.Value?.Backgrounds?.Any() == true;
+            }
+        }
+
         private bool isInSeason => seasonalBackgrounds.Value != null && DateTimeOffset.Now < seasonalBackgrounds.Value.EndDate;
     }