From 416635179b173fce299c03ef171e4f7191ae9cfe Mon Sep 17 00:00:00 2001 From: Bruno Herbelin Date: Sun, 18 Dec 2022 12:03:29 +0100 Subject: [PATCH] Fix warning runtime invalid scancode --- src/ControlManager.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/ControlManager.cpp b/src/ControlManager.cpp index 418e4a9..aa64e2b 100644 --- a/src/ControlManager.cpp +++ b/src/ControlManager.cpp @@ -1190,16 +1190,18 @@ int Control::layoutKey(int key) // conversion of alphabetical keys from keyboard layout for(int l=GLFW_KEY_SEMICOLON; l < GLFW_KEY_LEFT_BRACKET; ++l) { + int sc = glfwGetKeyScancode(l); + if ( sc > 0 ) { + const char* key_name = glfwGetKeyName(l, sc); + if (key_name) { + int letter = (int)key_name[0]; - const char* key_name = glfwGetKeyName(l, 0); - if (key_name) { - int letter = (int)key_name[0]; + // Convert to upper-case + if (letter >= 97 && letter <= 122) + letter -= 32; - // Convert to upper-case - if (letter >= 97 && letter <= 122) - letter -= 32; - - _keyMap[l] = letter; + _keyMap[l] = letter; + } } }