Merge remote-tracking branch 'origin/master' into editor-waveform-timeline

# Conflicts:
#	osu-framework
This commit is contained in:
smoogipoo
2017-10-12 15:32:11 +09:00
22 changed files with 323 additions and 34 deletions

View File

@ -550,7 +550,7 @@ namespace osu.Game.Beatmaps
catch { return null; }
}
private string getPathForFile(string filename) => BeatmapSetInfo.Files.First(f => f.Filename == filename).FileInfo.StoragePath;
private string getPathForFile(string filename) => BeatmapSetInfo.Files.First(f => string.Equals(f.Filename, filename, StringComparison.InvariantCultureIgnoreCase)).FileInfo.StoragePath;
protected override Texture GetBackground()
{