From a5493ce0d1f70b6db0d9ce846ed14c42f360946e Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 23 Jan 2022 17:51:32 +0900
Subject: [PATCH] Fix incorrect nesting of statements causing completely broken
 logic

---
 osu.Game/Screens/Menu/IntroScreen.cs | 54 ++++++++++++++--------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/osu.Game/Screens/Menu/IntroScreen.cs b/osu.Game/Screens/Menu/IntroScreen.cs
index 10be90a5f0..e66ecc74e1 100644
--- a/osu.Game/Screens/Menu/IntroScreen.cs
+++ b/osu.Game/Screens/Menu/IntroScreen.cs
@@ -99,51 +99,51 @@ namespace osu.Game.Screens.Menu
             {
                 realmContextFactory.Run(realm =>
                 {
-                    var sets = realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending && !s.Protected).AsRealmCollection();
+                    var usableBeatmapSets = realm.All<BeatmapSetInfo>().Where(s => !s.DeletePending && !s.Protected).AsRealmCollection();
 
-                    int setCount = sets.Count;
+                    int setCount = usableBeatmapSets.Count;
 
                     if (setCount > 0)
                     {
-                        var found = sets[RNG.Next(0, setCount - 1)].Beatmaps.FirstOrDefault();
+                        var found = usableBeatmapSets[RNG.Next(0, setCount - 1)].Beatmaps.FirstOrDefault();
 
                         if (found != null)
                             initialBeatmap = beatmaps.GetWorkingBeatmap(found);
                     }
                 });
+            }
 
-                // we generally want a song to be playing on startup, so use the intro music even if a user has specified not to if no other track is available.
-                if (initialBeatmap == null)
+            // we generally want a song to be playing on startup, so use the intro music even if a user has specified not to if no other track is available.
+            if (initialBeatmap == null)
+            {
+                if (!loadThemedIntro())
                 {
-                    if (!loadThemedIntro())
-                    {
-                        // if we detect that the theme track or beatmap is unavailable this is either first startup or things are in a bad state.
-                        // this could happen if a user has nuked their files store. for now, reimport to repair this.
-                        var import = beatmaps.Import(new ZipArchiveReader(game.Resources.GetStream($"Tracks/{BeatmapFile}"), BeatmapFile)).GetResultSafely();
+                    // if we detect that the theme track or beatmap is unavailable this is either first startup or things are in a bad state.
+                    // this could happen if a user has nuked their files store. for now, reimport to repair this.
+                    var import = beatmaps.Import(new ZipArchiveReader(game.Resources.GetStream($"Tracks/{BeatmapFile}"), BeatmapFile)).GetResultSafely();
 
-                        import?.PerformWrite(b => b.Protected = true);
+                    import?.PerformWrite(b => b.Protected = true);
 
-                        loadThemedIntro();
-                    }
+                    loadThemedIntro();
                 }
+            }
 
-                bool loadThemedIntro()
+            bool loadThemedIntro()
+            {
+                var setInfo = beatmaps.QueryBeatmapSet(b => b.Hash == BeatmapHash);
+
+                if (setInfo == null)
+                    return false;
+
+                setInfo.PerformRead(s =>
                 {
-                    var setInfo = beatmaps.QueryBeatmapSet(b => b.Hash == BeatmapHash);
+                    if (s.Beatmaps.Count == 0)
+                        return;
 
-                    if (setInfo == null)
-                        return false;
+                    initialBeatmap = beatmaps.GetWorkingBeatmap(s.Beatmaps.First());
+                });
 
-                    setInfo.PerformRead(s =>
-                    {
-                        if (s.Beatmaps.Count == 0)
-                            return;
-
-                        initialBeatmap = beatmaps.GetWorkingBeatmap(s.Beatmaps.First());
-                    });
-
-                    return UsingThemedIntro = initialBeatmap != null;
-                }
+                return UsingThemedIntro = initialBeatmap != null;
             }
         }