From b3fcfa4bbc0015ac077bf664b87fcdc1800d13b6 Mon Sep 17 00:00:00 2001 From: Philip Zander Date: Thu, 9 Dec 2021 12:24:35 +0100 Subject: [PATCH] gdk/win32: Fix group parameter not being used by translate_keyboard_state gdk_win32_keymap_translate_keyboard_state erroneously used the active group rather than the specified group, which caused shortcuts not to work in Inkscape when using a Cyrillic layout. --- gdk/win32/gdkkeys-win32.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gdk/win32/gdkkeys-win32.c b/gdk/win32/gdkkeys-win32.c index a5b606ef74..5e725b5cba 100644 --- a/gdk/win32/gdkkeys-win32.c +++ b/gdk/win32/gdkkeys-win32.c @@ -986,9 +986,11 @@ gdk_win32_keymap_translate_keyboard_state (GdkKeymap *gdk_keymap, keymap = GDK_WIN32_KEYMAP (gdk_keymap); update_keymap (keymap); - + + g_return_val_if_fail (group >= 0 && group < keymap->layout_infos->len, FALSE); + layout_info = &g_array_index (keymap->layout_infos, GdkWin32KeymapLayoutInfo, - keymap->active_layout); + group); vk = hardware_keycode; mod_bits = gdk_mod_mask_to_mod_bits (state);