Fix nil error in key check for warning about overwriting user key act…

…ions with defaults (#6510)
FAForever · Jan 13, 2025 · 5ab1d3e · 5ab1d3e
1 parent 44a7450
commit 5ab1d3e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/changelog/snippets/fix.6510.md b/changelog/snippets/fix.6510.md
@@ -0,0 +1 @@
+- (#6510) Fix a warning not being given when user key actions were overwritten by default actions.
diff --git a/lua/keymap/keymapper.lua b/lua/keymap/keymapper.lua
@@ -207,15 +207,15 @@ function GetKeyActions()
     local debugKeyActions = import("/lua/keymap/debugkeyactions.lua").debugKeyActions
 
     for k,v in keyActions do
-        if ret[k] and ret[k] != v.action then
+        if ret[k] and ret[k].action != v.action then
             WARN(string.format("Overwriting user key action: %s -> %s", k, ret[k].action))
         end
 
         ret[k] = v
     end
 
     for k,v in debugKeyActions do
-        if ret[k] and ret[k] != v.action then
+        if ret[k] and ret[k].action != v.action then
             WARN(string.format("Overwriting user key action: %s -> %s", k, ret[k].action))
         end
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- (#6510) Fix a warning not being given when user key actions were overwritten by default actions.