sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
FreezyLemon 2017-12-08 12:50:04 +01:00
parent d93a1fdaae
commit e1c04a1f44
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Beatmaps/BeatmapManager.cs
View File

@ -34,6 +34,11 @@ namespace osu.Game.Beatmaps
/// </summary> /// </summary>
public class BeatmapManager public class BeatmapManager
{ {
/// <summary>
/// The hash of the supplied menu music's beatmap set.
/// </summary>
public const string MENU_MUSIC_BEATMAP_HASH = "3c8b1fcc9434dbb29e2fb613d3b9eada9d7bb6c125ceb32396c3b53437280c83";
/// <summary> /// <summary>
/// Fired when a new <see cref="BeatmapSetInfo"/> becomes available in the database. /// Fired when a new <see cref="BeatmapSetInfo"/> becomes available in the database.
/// </summary> /// </summary>
@ -341,6 +346,10 @@ namespace osu.Game.Beatmaps
public void Undelete(BeatmapSetInfo beatmapSet) 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) lock (importContext)
{ {
var context = importContext.Value; var context = importContext.Value;

4
osu.Game/Screens/Menu/Intro.cs
View File

@ -20,8 +20,6 @@ namespace osu.Game.Screens.Menu
{ {
public class Intro : OsuScreen public class Intro : OsuScreen
{ {
private const string menu_music_beatmap_hash = "3c8b1fcc9434dbb29e2fb613d3b9eada9d7bb6c125ceb32396c3b53437280c83";
/// <summary> /// <summary>
/// Whether we have loaded the menu previously. /// Whether we have loaded the menu previously.
/// </summary> /// </summary>
@ -58,7 +56,7 @@ namespace osu.Game.Screens.Menu
if (setInfo == null) 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) if (setInfo == null)
{ {