src/main.c Modified

@@ -120,14 +120,6 @@
 	free(output);
     };
 
-    struct keyboard *keyboard, *tkeyboard;
-    wl_list_for_each_safe(keyboard, tkeyboard, &wimp.keyboards, link) {
-	wl_list_remove(&keyboard->link);
-	wl_list_remove(&keyboard->modifier_listener.link);
-	wl_list_remove(&keyboard->key_listener.link);
-	free(keyboard);
-    };
-
     struct mark *mark, *tmark;
     wl_list_for_each_safe(mark, tmark, &wimp.marks, link) {
 	wl_list_remove(&mark->link);

src/keyboard.c Modified

@@ -114,8 +114,10 @@
     wl_list_remove(&keyboard->destroy_listener.link);
     free(keyboard);
 
-    keyboard = wl_container_of(wimp.keyboards.next, keyboard, link);
-    wlr_seat_set_keyboard(wimp.seat, keyboard->device);
+    if (!wl_list_empty(&wimp.keyboards)) {
+	keyboard = wl_container_of(wimp.keyboards.next, keyboard, link);
+	wlr_seat_set_keyboard(wimp.seat, keyboard->device);
+    }
 }