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

Merge remote-tracking branch 'upstream/master' into load-optimization

Browse Source
This commit is contained in:
Dean Herbert
2017-11-23 20:21:44 +09:00
parent 4986ad73f7 ccb531e6b6
commit 5ea3292dc5
50 changed files with 28 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/BeatmapSet/Header.cs
View File

@ -229,7 +229,7 @@ namespace osu.Game.Overlays.BeatmapSet
protected override void Dispose(bool isDisposing)
{
base.Dispose(isDisposing);
beatmaps.BeatmapSetAdded -= handleBeatmapAdd;
if (beatmaps != null) beatmaps.BeatmapSetAdded -= handleBeatmapAdd;
}
private void handleBeatmapAdd(BeatmapSetInfo beatmap)

2
osu.Game/Tests/Visual/TestCasePlayer.cs
View File

@ -23,8 +23,6 @@ namespace osu.Game.Tests.Visual
protected Player Player;
public override string Description => @"Showing everything to play the game.";
/// <summary>
/// Create a TestCase which runs through the Player screen.
/// </summary>