From e1c04a1f445933c1deb21b26a4bc39e190eb130c Mon Sep 17 00:00:00 2001
From: FreezyLemon <freezestyleman@gmx.de>
Date: Fri, 8 Dec 2017 12:50:04 +0100
Subject: [PATCH] Added check for "menu music beatmap hash" before undeleting
 so circles.osu doesn't get imported on Undelete. Also moved the const
 property to BeatmapManager.

---
 osu.Game/Beatmaps/BeatmapManager.cs | 9 +++++++++
 osu.Game/Screens/Menu/Intro.cs      | 4 +---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapManager.cs b/osu.Game/Beatmaps/BeatmapManager.cs
index e00505d9b3..bc9a3bbacb 100644
--- a/osu.Game/Beatmaps/BeatmapManager.cs
+++ b/osu.Game/Beatmaps/BeatmapManager.cs
@@ -34,6 +34,11 @@ namespace osu.Game.Beatmaps
     /// </summary>
     public class BeatmapManager
     {
+        /// <summary>
+        /// The hash of the supplied menu music's beatmap set.
+        /// </summary>
+        public const string MENU_MUSIC_BEATMAP_HASH = "3c8b1fcc9434dbb29e2fb613d3b9eada9d7bb6c125ceb32396c3b53437280c83";
+
         /// <summary>
         /// Fired when a new <see cref="BeatmapSetInfo"/> becomes available in the database.
         /// </summary>
@@ -341,6 +346,10 @@ namespace osu.Game.Beatmaps
 
         public void Undelete(BeatmapSetInfo beatmapSet)
         {
+            // So circles.osz doesn't get added as a map
+            if (beatmapSet.Hash == MENU_MUSIC_BEATMAP_HASH)
+                return;
+
             lock (importContext)
             {
                 var context = importContext.Value;
diff --git a/osu.Game/Screens/Menu/Intro.cs b/osu.Game/Screens/Menu/Intro.cs
index d7beb34a2f..6a6351305b 100644
--- a/osu.Game/Screens/Menu/Intro.cs
+++ b/osu.Game/Screens/Menu/Intro.cs
@@ -20,8 +20,6 @@ namespace osu.Game.Screens.Menu
 {
     public class Intro : OsuScreen
     {
-        private const string menu_music_beatmap_hash = "3c8b1fcc9434dbb29e2fb613d3b9eada9d7bb6c125ceb32396c3b53437280c83";
-
         /// <summary>
         /// Whether we have loaded the menu previously.
         /// </summary>
@@ -58,7 +56,7 @@ namespace osu.Game.Screens.Menu
 
             if (setInfo == null)
             {
-                setInfo = beatmaps.QueryBeatmapSet(b => b.Hash == menu_music_beatmap_hash);
+                setInfo = beatmaps.QueryBeatmapSet(b => b.Hash == BeatmapManager.MENU_MUSIC_BEATMAP_HASH);
 
                 if (setInfo == null)
                 {