diff --git a/Content.Client/UserInterface/Controls/MenuButton.cs b/Content.Client/UserInterface/Controls/MenuButton.cs index 540a8ecb57..a0ba21da74 100644 --- a/Content.Client/UserInterface/Controls/MenuButton.cs +++ b/Content.Client/UserInterface/Controls/MenuButton.cs @@ -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()