epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix two crashes in hotkey menu, trying to select not visible widgets

Browse Source
This commit is contained in:
ThomasChr
2023-03-29 20:44:45 +02:00
committed by Gustas
parent 75a47aabb5
commit a5ef6801c9
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs
View File

@@ -161,7 +161,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
foreach (var hd in modData.Hotkeys.Definitions) foreach (var hd in modData.Hotkeys.Definitions)
{ {
modData.Hotkeys.Set(hd.Name, hd.Default); modData.Hotkeys.Set(hd.Name, hd.Default);
WidgetUtils.TruncateButtonToTooltip(panel.Get(hd.Name).Get<ButtonWidget>("HOTKEY"), hd.Default.DisplayString()); var hotkeyButton = panel.GetOrNull(hd.Name)?.Get<ButtonWidget>("HOTKEY");
if (hotkeyButton != null)
WidgetUtils.TruncateButtonToTooltip(hotkeyButton, hd.Default.DisplayString());
} }
}; };
} }
@@ -302,7 +304,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
void OverrideHotkey() void OverrideHotkey()
{ {
var duplicateHotkeyButton = hotkeyList.Get<ContainerWidget>(duplicateHotkeyDefinition.Name).Get<ButtonWidget>("HOTKEY"); var duplicateHotkeyButton = hotkeyList.GetOrNull<ContainerWidget>(duplicateHotkeyDefinition.Name)?.Get<ButtonWidget>("HOTKEY");
if (duplicateHotkeyButton != null)
WidgetUtils.TruncateButtonToTooltip(duplicateHotkeyButton, Hotkey.Invalid.DisplayString()); WidgetUtils.TruncateButtonToTooltip(duplicateHotkeyButton, Hotkey.Invalid.DisplayString());
modData.Hotkeys.Set(duplicateHotkeyDefinition.Name, Hotkey.Invalid); modData.Hotkeys.Set(duplicateHotkeyDefinition.Name, Hotkey.Invalid);
Game.Settings.Save(); Game.Settings.Save();