mirror of
https://github.com/ppy/osu.git
synced 2024-11-11 09:27:29 +08:00
Fix point conversion not using invariant culture
This was only the case in a fallback path (ie. when the user provides a `json` file with an old or computed format from an external source). Closes #20844.
This commit is contained in:
parent
4ad669e729
commit
889c2978d7
@ -6,6 +6,7 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Drawing;
|
using System.Drawing;
|
||||||
|
using System.Globalization;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
namespace osu.Game.Tournament
|
namespace osu.Game.Tournament
|
||||||
@ -31,7 +32,9 @@ namespace osu.Game.Tournament
|
|||||||
|
|
||||||
Debug.Assert(str != null);
|
Debug.Assert(str != null);
|
||||||
|
|
||||||
return new PointConverter().ConvertFromString(str) as Point? ?? new Point();
|
// Null check suppression is required due to .NET standard expecting a non-null context.
|
||||||
|
// Seems to work fine at a runtime level (and the parameter is nullable in .NET 6+).
|
||||||
|
return new PointConverter().ConvertFromString(null!, CultureInfo.InvariantCulture, str) as Point? ?? new Point();
|
||||||
}
|
}
|
||||||
|
|
||||||
var point = new Point();
|
var point = new Point();
|
||||||
|
Loading…
Reference in New Issue
Block a user