From 16251a8abe6b31111af3bd4e48b5207daefa89b7 Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Sun, 4 May 2025 14:55:52 +0200 Subject: [PATCH] Fix null reference in I18N language handling --- app/MindWork AI Studio/Tools/PluginSystem/I18N.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/MindWork AI Studio/Tools/PluginSystem/I18N.cs b/app/MindWork AI Studio/Tools/PluginSystem/I18N.cs index c327da48..869f01ca 100644 --- a/app/MindWork AI Studio/Tools/PluginSystem/I18N.cs +++ b/app/MindWork AI Studio/Tools/PluginSystem/I18N.cs @@ -5,7 +5,7 @@ public class I18N : ILang public static readonly I18N I = new(); private static readonly ILogger LOG = Program.LOGGER_FACTORY.CreateLogger(); - private ILanguagePlugin language = PluginFactory.BaseLanguage; + private ILanguagePlugin? language = PluginFactory.BaseLanguage; private I18N() { @@ -18,12 +18,18 @@ public class I18N : ILang public string T(string fallbackEN) { LOG.LogWarning("Using I18N.I.T without namespace and type is probably wrong, because the I18N key collection process of the build system will not find those keys."); - return this.GetText(this.language, fallbackEN); + if(this.language is not null) + return this.GetText(this.language, fallbackEN); + + return fallbackEN; } public string T(string fallbackEN, string? typeNamespace, string? typeName) { - return this.GetText(this.language, fallbackEN, typeNamespace, typeName); + if(this.language is not null) + return this.GetText(this.language, fallbackEN, typeNamespace, typeName); + + return fallbackEN; } #endregion