From f222dd2d3eb449c46aee3ea4f12efead7a2771de Mon Sep 17 00:00:00 2001 From: Stan Date: Mon, 8 Feb 2021 13:56:40 +0000 Subject: [PATCH] Make pages relying on hotkeys more resilient Reviewed by: @wraitii Differential Revision: https://code.wildfiregames.com/D3541 This was SVN commit r24856. --- binaries/data/mods/public/gui/common/hotkeys.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/binaries/data/mods/public/gui/common/hotkeys.js b/binaries/data/mods/public/gui/common/hotkeys.js index 81f66333d3..a7d429509f 100644 --- a/binaries/data/mods/public/gui/common/hotkeys.js +++ b/binaries/data/mods/public/gui/common/hotkeys.js @@ -27,6 +27,9 @@ function formatHotkeyCombination(comb, translateScancodes = true) function formatHotkeyCombinations(combinations, translateScancodes = true) { + if (!combinations || !combinations.length) + return ""; + let combs = combinations.map(x => formatHotkeyCombination(x, translateScancodes)); combs.sort((a, b) => a.length - b.length || a - b); return translateScancodes ? combs.join(", ") : combs;