Skip to content

Commit 4eed084

Browse files
committed
Merge pull request godotengine#111795 from bruvzg/x11_kbd_no_lbl
[X11] Fix `keyboard_get_label_from_physical` errors when used on key without label.
2 parents d64a86a + cf21565 commit 4eed084

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

platform/linuxbsd/x11/display_server_x11.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3746,8 +3746,11 @@ Key DisplayServerX11::keyboard_get_label_from_physical(Key p_keycode) const {
37463746
Key key = KeyMappingX11::get_keycode(xkeysym);
37473747
#ifdef XKB_ENABLED
37483748
if (xkb_loaded_v08p) {
3749-
String keysym = String::chr(xkb_keysym_to_utf32(xkb_keysym_to_upper(xkeysym)));
3750-
key = fix_key_label(keysym[0], KeyMappingX11::get_keycode(xkeysym));
3749+
char32_t chr = xkb_keysym_to_utf32(xkb_keysym_to_upper(xkeysym));
3750+
if (chr != 0) {
3751+
String keysym = String::chr(chr);
3752+
key = fix_key_label(keysym[0], KeyMappingX11::get_keycode(xkeysym));
3753+
}
37513754
}
37523755
#endif
37533756

0 commit comments

Comments
 (0)