h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 06:03:08 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1342 from smoogipoo/fix-storyboard-exception

Browse Source 
Fix trimming too early in OsuLegacyDecoder crashing storyboards
This commit is contained in:
Dean Herbert 2017-10-11 13:04:41 +09:00 committed by GitHub
commit 6542079385
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
View File

@ -611,9 +611,9 @@ namespace osu.Game.Beatmaps.Formats
CommandTimelineGroup timelineGroup = null; CommandTimelineGroup timelineGroup = null;
string line; string line;
while ((line = stream.ReadLine()?.Trim()) != null) while ((line = stream.ReadLine()) != null)
{ {
if (string.IsNullOrEmpty(line)) if (string.IsNullOrWhiteSpace(line))
continue; continue;
if (line.StartsWith("//")) if (line.StartsWith("//"))
@ -679,10 +679,12 @@ namespace osu.Game.Beatmaps.Formats
private KeyValuePair<string, string> splitKeyVal(string line, char separator) private KeyValuePair<string, string> splitKeyVal(string line, char separator)
{ {
var split = line.Trim().Split(new[] { separator }, 2);
return new KeyValuePair<string, string> return new KeyValuePair<string, string>
( (
line.Remove(line.IndexOf(separator)).Trim(), split[0].Trim(),
line.Substring(line.IndexOf(separator) + 1).Trim() split.Length > 1 ? split[1].Trim() : string.Empty
); );
} }