]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix rebinding keys crashing the game (#39732)
authorslarticodefast <161409025+slarticodefast@users.noreply.github.com>
Mon, 18 Aug 2025 18:58:30 +0000 (20:58 +0200)
committerGitHub <noreply@github.com>
Mon, 18 Aug 2025 18:58:30 +0000 (11:58 -0700)
fix control settings

Content.Client/UserInterface/Controls/MenuButton.cs

index 540a8ecb579a268c473186adc07c0ced51ac9b53..a0ba21da74465cbd7bfddf4a183844984cf7fee6 100644 (file)
@@ -25,7 +25,7 @@ public sealed class MenuButton : ContainerButton
     private Color NormalColor => HasStyleClass(StyleClassRedTopButton) ? ColorRedNormal : ColorNormal;
     private Color HoveredColor => HasStyleClass(StyleClassRedTopButton) ? ColorRedHovered : ColorHovered;
 
-    private BoundKeyFunction _function;
+    private BoundKeyFunction? _function;
     private readonly BoxContainer _root;
     private readonly TextureRect? _buttonIcon;
     private readonly Label? _buttonLabel;
@@ -33,13 +33,13 @@ public sealed class MenuButton : ContainerButton
     public string AppendStyleClass { set => AddStyleClass(value); }
     public Texture? Icon { get => _buttonIcon!.Texture; set => _buttonIcon!.Texture = value; }
 
-    public BoundKeyFunction BoundKey
+    public BoundKeyFunction? BoundKey
     {
         get => _function;
         set
         {
             _function = value;
-            _buttonLabel!.Text = BoundKeyHelper.ShortKeyName(value);
+            _buttonLabel!.Text = _function == null ? "" : BoundKeyHelper.ShortKeyName(_function.Value);
         }
     }
 
@@ -95,12 +95,12 @@ public sealed class MenuButton : ContainerButton
 
     private void OnKeyBindingChanged(IKeyBinding obj)
     {
-        _buttonLabel!.Text = BoundKeyHelper.ShortKeyName(_function);
+        _buttonLabel!.Text = _function == null ? "" : BoundKeyHelper.ShortKeyName(_function.Value);
     }
 
     private void OnKeyBindingChanged()
     {
-        _buttonLabel!.Text = BoundKeyHelper.ShortKeyName(_function);
+        _buttonLabel!.Text = _function == null ? "" : BoundKeyHelper.ShortKeyName(_function.Value);
     }
 
     protected override void StylePropertiesChanged()