From 0256cd1473a574c2eb087f420f8356fee9e08aa7 Mon Sep 17 00:00:00 2001 From: Tony Crisci Date: Sat, 16 Dec 2017 19:16:00 -0500 Subject: [PATCH] fix keyboard hotplugging --- include/sway/input/keyboard.h | 1 - sway/input/keyboard.c | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sway/input/keyboard.h b/include/sway/input/keyboard.h index 0b0c15497..d9251f4c3 100644 --- a/include/sway/input/keyboard.h +++ b/include/sway/input/keyboard.h @@ -5,7 +5,6 @@ struct sway_keyboard { struct sway_seat_device *seat_device; - struct wl_list link; // sway_seat::keyboards struct xkb_keymap *keymap; diff --git a/sway/input/keyboard.c b/sway/input/keyboard.c index b9b571a67..ce0df3c56 100644 --- a/sway/input/keyboard.c +++ b/sway/input/keyboard.c @@ -103,9 +103,10 @@ void sway_keyboard_configure(struct sway_keyboard *keyboard) { } void sway_keyboard_destroy(struct sway_keyboard *keyboard) { - xkb_keymap_unref(keyboard->keymap); + if (!keyboard) { + return; + } wl_list_remove(&keyboard->keyboard_key.link); wl_list_remove(&keyboard->keyboard_modifiers.link); - wl_list_remove(&keyboard->link); free(keyboard); }