Merge branch 'master' into generic-download-model-manager

This commit is contained in:
Dean Herbert
2019-06-24 18:35:58 +09:00
committed by GitHub
185 changed files with 9501 additions and 1557 deletions

View File

@ -269,7 +269,7 @@ namespace osu.Game.Beatmaps
foreach (var name in reader.Filenames.Where(f => f.EndsWith(".osu")))
{
using (var raw = reader.GetStream(name))
using (var ms = new MemoryStream()) //we need a memory stream so we can seek and shit
using (var ms = new MemoryStream()) //we need a memory stream so we can seek
using (var sr = new StreamReader(ms))
{
raw.CopyTo(ms);