Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2024-12-27 21:58:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

input/keyboard: remove group listeners on destroy

Browse source 
This adds two missing calls to wl_list_remove to remove the key and
modifier listeners for the keyboard group's keyboard when destroying
the keyboard group. This fixes some crashes when changing the keymap of
the last keyboard in a group with a keyboard binding.
This commit is contained in:
Brian Ashworth 2019-12-12 23:39:00 -05:00 committed by Simon Ser
parent 2f84d6e349
commit f365ffef34
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sway/input/keyboard.c
View file

@ -675,6 +675,8 @@ static void sway_keyboard_group_remove(struct sway_keyboard *keyboard) {
struct sway_keyboard_group *sway_group = wlr_group->data; struct sway_keyboard_group *sway_group = wlr_group->data;
wlr_group->data = NULL; wlr_group->data = NULL;
wl_list_remove(&sway_group->link); wl_list_remove(&sway_group->link);
wl_list_remove(&sway_group->keyboard_key.link);
wl_list_remove(&sway_group->keyboard_modifiers.link);
sway_keyboard_destroy(sway_group->seat_device->keyboard); sway_keyboard_destroy(sway_group->seat_device->keyboard);
free(sway_group->seat_device->input_device); free(sway_group->seat_device->input_device);
free(sway_group->seat_device); free(sway_group->seat_device);