From addc919636c9b6c14aabbd1d0fa34097db2ce335 Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Wed, 14 Aug 2019 05:38:42 +0000
Subject: [PATCH] Amend r7993
git-svn-id: https://svn.eduke32.com/eduke32@7996 1a8010ca-5511-0410-912e-c29ae57300e0
---
source/duke3d/src/config.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/source/duke3d/src/config.cpp b/source/duke3d/src/config.cpp
index 402f9ab00..2be339c54 100644
--- a/source/duke3d/src/config.cpp
+++ b/source/duke3d/src/config.cpp
@@ -1131,7 +1131,8 @@ void CONFIG_WriteSetup(uint32_t flags)
char const * CONFIG_GetGameFuncOnKeyboard(int gameFunc)
{
- return KB_ScanCodeToString(ud.config.KeyboardKeys[gameFunc][0]);
+ const char * string0 = KB_ScanCodeToString(ud.config.KeyboardKeys[gameFunc][0]);
+ return string0[0] == '\0' ? KB_ScanCodeToString(ud.config.KeyboardKeys[gameFunc][1]) : string0;
}
char const * CONFIG_GetGameFuncOnMouse(int gameFunc)