Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crash on load when no slot key assigned #26354

Merged
merged 1 commit into from
Mar 23, 2024
Merged

Fix crash on load when no slot key assigned #26354

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Content.Client/UserInterface/Systems/Actions/Controls/ActionButtonContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@ ActionButton MakeButton(int index)
{
var button = new ActionButton(_entity);

if (keys.TryGetValue(index, out var boundKey))
{
button.KeyBind = boundKey;
if (!keys.TryGetValue(index, out var boundKey))
return button;

var binding = _input.GetKeyBinding(boundKey);
button.KeyBind = boundKey;
if (_input.TryGetKeyBinding(boundKey, out var binding))
{
button.Label.Text = binding.GetKeyString();
}

Expand Down
Loading