Merge branch 'marynate-PR-global-local-crash'

2021-08-07 16:52:48 +02:00
parent 054def3d13 1c5754beff
commit bc27890818
1 changed files with 6 additions and 1 deletions
--- a/Source/Engine/Localization/Localization.cpp
+++ b/Source/Engine/Localization/Localization.cpp
@@ -189,7 +189,12 @@ void LocalizationService::OnLocalizationChanged()
            localeName[currentCulture.Length() + 5] = '8';
            localeName[currentCulture.Length() + 6] = 0;
        }
-        std::locale::global(std::locale(localeName));
+        try
+        {
+            std::locale::global(std::locale(localeName));
+        }
+        catch (std::runtime_error const&) {}
+        catch (...) {}
    }
 #endif