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

This commit is contained in:
Dean Herbert
2017-11-23 20:21:44 +09:00
50 changed files with 28 additions and 101 deletions

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)