From 40145e13b1c8b047cfcc8d30aecd7b34e003c80a Mon Sep 17 00:00:00 2001
From: Aireil <33433913+Aireil@users.noreply.github.com>
Date: Fri, 30 Apr 2021 23:15:20 +0200
Subject: [PATCH] fix: UiLanguage null when no override

---
 Dalamud/Plugin/DalamudPluginInterface.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/Dalamud/Plugin/DalamudPluginInterface.cs b/Dalamud/Plugin/DalamudPluginInterface.cs
index 650ee6313..e4a5b45fa 100644
--- a/Dalamud/Plugin/DalamudPluginInterface.cs
+++ b/Dalamud/Plugin/DalamudPluginInterface.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Dynamic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -50,7 +51,19 @@ namespace Dalamud.Plugin
             this.configs = configs;
 
             this.Sanitizer = new Sanitizer(this.Data.Language);
-            this.UiLanguage = this.dalamud.Configuration.LanguageOverride;
+            if (this.dalamud.Configuration.LanguageOverride != null)
+            {
+                this.UiLanguage = this.dalamud.Configuration.LanguageOverride;
+            }
+            else
+            {
+                var currentUiLang = CultureInfo.CurrentUICulture;
+                if (Localization.ApplicableLangCodes.Any(x => currentUiLang.TwoLetterISOLanguageName == x))
+                    this.UiLanguage = currentUiLang.TwoLetterISOLanguageName;
+                else
+                    this.UiLanguage = "en";
+            }
+
             dalamud.LocalizationManager.OnLocalizationChanged += this.OnLocalizationChanged;
         }