Merge remote-tracking branch 'refs/remotes/origin/master' into legacy-beatmap-saving

This commit is contained in:
smoogipoo
2019-12-13 19:01:25 +09:00
92 changed files with 2044 additions and 1122 deletions

View File

@ -8,8 +8,8 @@ using System.IO;
using System.Linq;
using osuTK;
using osuTK.Graphics;
using osu.Framework.Extensions;
using osu.Framework.Graphics;
using osu.Framework.IO.File;
using osu.Game.IO;
using osu.Game.Storyboards;
using osu.Game.Beatmaps.Legacy;
@ -336,6 +336,6 @@ namespace osu.Game.Beatmaps.Formats
}
}
private string cleanFilename(string path) => FileSafety.PathStandardise(path.Trim('"'));
private string cleanFilename(string path) => path.Trim('"').ToStandardisedPath();
}
}