From 0b46c19b23995f42e35b82877b41404200f109ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20H=C3=BCbner?= <maxshuebner@gmail.com>
Date: Fri, 30 Oct 2020 17:16:51 +0100
Subject: [PATCH] Move seasonalBackgroundMode check up and early return if
 available

---
 .../Backgrounds/BackgroundScreenDefault.cs     | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
index 39ecd70084..b65b45060f 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenDefault.cs
@@ -79,6 +79,18 @@ namespace osu.Game.Screens.Backgrounds
             Background newBackground;
             string backgroundName;
 
+            if (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Always
+                || seasonalBackgroundMode.Value == SeasonalBackgroundMode.Sometimes && seasonalBackgroundLoader.IsInSeason)
+            {
+                var seasonalBackground = seasonalBackgroundLoader.LoadBackground();
+
+                if (seasonalBackground != null)
+                {
+                    seasonalBackground.Depth = currentDisplay;
+                    return seasonalBackground;
+                }
+            }
+
             switch (introSequence.Value)
             {
                 case IntroSequence.Welcome:
@@ -106,12 +118,6 @@ namespace osu.Game.Screens.Backgrounds
             else
                 newBackground = new Background(backgroundName);
 
-            if (seasonalBackgroundMode.Value == SeasonalBackgroundMode.Always
-                || seasonalBackgroundMode.Value == SeasonalBackgroundMode.Sometimes && seasonalBackgroundLoader.IsInSeason)
-            {
-                newBackground = seasonalBackgroundLoader.LoadBackground() ?? newBackground;
-            }
-
             newBackground.Depth = currentDisplay;
 
             return newBackground;