sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-29 01:17:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

Try-catch around localisation store registration

Browse Source 
Some platforms (android, older windows versions) will throw exceptions
at runtime when an unsupported `CultureInfo` is attempted to be
instantiated, leading to nasty crashes. Add a preventative try-catch
registration to prevent the crash, and log the errors for visibility.
This commit is contained in:
Bartłomiej Dach 2021-06-19 08:00:36 +02:00
parent 89c27dcb10
commit 76db87f9cb
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osu.Game/OsuGame.cs
View File

@ -55,6 +55,7 @@ using osu.Game.IO;
using osu.Game.Localisation; using osu.Game.Localisation;
using osu.Game.Performance; using osu.Game.Performance;
using osu.Game.Skinning.Editor; using osu.Game.Skinning.Editor;
using osu.Framework.Extensions;
namespace osu.Game namespace osu.Game
{ {
@ -585,7 +586,15 @@ namespace osu.Game
foreach (var language in Enum.GetValues(typeof(Language)).OfType<Language>()) foreach (var language in Enum.GetValues(typeof(Language)).OfType<Language>())
{ {
var cultureCode = language.ToCultureCode(); var cultureCode = language.ToCultureCode();
Localisation.AddLanguage(cultureCode, new ResourceManagerLocalisationStore(cultureCode));
try
{
Localisation.AddLanguage(cultureCode, new ResourceManagerLocalisationStore(cultureCode));
}
catch (Exception ex)
{
Logger.Error(ex, $"Could not load localisations for language \"{cultureCode}\"");
}
} }
// The next time this is updated is in UpdateAfterChildren, which occurs too late and results // The next time this is updated is in UpdateAfterChildren, which occurs too late and results