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

Merged branch master into remove-source-on-import

Browse Source
This commit is contained in:
Mikal Stodal
2017-03-02 13:39:22 +01:00
parent 47162a3e91 d74a601180
commit 2498305174
77 changed files with 893 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Database/BeatmapInfo.cs
View File

@ -88,7 +88,7 @@ namespace osu.Game.Database
return ID == other?.ID;
}
public bool AudioEquals(BeatmapInfo other) => other != null &&
public bool AudioEquals(BeatmapInfo other) => other != null && BeatmapSet != null && other.BeatmapSet != null &&
BeatmapSet.Path == other.BeatmapSet.Path &&
(Metadata ?? BeatmapSet.Metadata).AudioFile == (other.Metadata ?? other.BeatmapSet.Metadata).AudioFile;
}