sway

commit 0256cd1473a574c2eb087f420f8356fee9e08aa7
parent 9e4fc7253e5e82f443ae8e1a27ced12fb13f8a67
Author: Tony Crisci <tony@dubstepdish.com>
Date:   Sat, 16 Dec 2017 19:16:00 -0500

fix keyboard hotplugging

Diffstat:
M
include/sway/input/keyboard.h
 | 
1
-
M
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
@@ -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
@@ -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);
 }