From e89e6edfb879e4700fa61c484778c87afb6c27f0 Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Tue, 22 Mar 2022 19:29:17 +0100 Subject: [PATCH] Fix crash in scripting init if current localization is null --- Source/Engine/Scripting/Scripting.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Source/Engine/Scripting/Scripting.cs b/Source/Engine/Scripting/Scripting.cs index 5c7689fdb..6eff982d9 100644 --- a/Source/Engine/Scripting/Scripting.cs +++ b/Source/Engine/Scripting/Scripting.cs @@ -170,8 +170,12 @@ namespace FlaxEngine private static void OnLocalizationChanged() { var currentThread = Thread.CurrentThread; - currentThread.CurrentUICulture = Localization.CurrentLanguage; - currentThread.CurrentCulture = Localization.CurrentCulture; + var language = Localization.CurrentLanguage; + if (language != null) + currentThread.CurrentUICulture = language; + var culture = Localization.CurrentCulture; + if (culture != null) + currentThread.CurrentCulture = culture; } ///