Finally Fixing it

Simple-Station · May 3, 2024 · 38060c9 · 38060c9
1 parent 5023cc4
commit 38060c9
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/Content.Client/UserInterface/Systems/Language/LanguageMenuUIController.cs b/Content.Client/UserInterface/Systems/Language/LanguageMenuUIController.cs
@@ -21,7 +21,7 @@ namespace Content.Client.UserInterface.Systems.Language;
 [UsedImplicitly]
 public sealed class LanguageMenuUIController : UIController, IOnStateEntered<GameplayState>, IOnStateExited<GameplayState>
 {
-    [UISystemDependency] private LanguageSystem _languageSystem = default!;
+    [UISystemDependency] private LanguageSystem? _languageSystem = default!;
     public LanguageMenuWindow? _languageWindow;
     private MenuButton? LanguageButton => UIManager.GetActiveUIWidgetOrNull<MenuBar.Widgets.GameTopMenuBar>()?.LanguageButton;
 
@@ -46,6 +46,12 @@ public void OnStateEntered(GameplayState state)
     {
         DebugTools.Assert(_languageWindow == null);
 
+        if (LanguagesUpdatedHook == null)
+            return;
+
+        if (_languageSystem == null)
+            return;
+
         _languageSystem.LanguagesUpdatedHook -= LanguagesUpdatedHook;
 
         _languageWindow = UIManager.CreateWindow<LanguageMenuWindow>();
@@ -62,6 +68,12 @@ public void OnStateExited(GameplayState state)
             _languageWindow = null;
         }
 
+        if (LanguagesUpdatedHook == null)
+            return;
+
+        if (_languageSystem == null)
+            return;
+
         _languageSystem.LanguagesUpdatedHook -= LanguagesUpdatedHook;
 
         CommandBinds.Unregister<LanguageMenuUIController>();