aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-03-18 16:27:58 -0400
committerGitHub <noreply@github.com>2017-03-18 16:27:58 -0400
commite956c61719d172f8053029e85dda046e99e8c235 (patch)
tree23256a4f23d2c64925b3767db49d413225e1a1fe
parentf6196b7e9a2d4b7b4ce326820b568031a74ff089 (diff)
parentb01e8dea5866d4fb0ff0823511d47d223876fe07 (diff)
downloadsway-e956c61719d172f8053029e85dda046e99e8c235.tar.xz
Merge branch 'master' into master
-rw-r--r--wayland/registry.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/wayland/registry.c b/wayland/registry.c
index 1ebc46e7..2df605a8 100644
--- a/wayland/registry.c
+++ b/wayland/registry.c
@@ -193,7 +193,7 @@ static void seat_handle_capabilities(void *data, struct wl_seat *seat,
if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !reg->keyboard) {
reg->keyboard = wl_seat_get_keyboard(reg->seat);
wl_keyboard_add_listener(reg->keyboard, &keyboard_listener, reg);
- } else if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && reg->keyboard) {
+ } else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && reg->keyboard) {
wl_keyboard_destroy(reg->keyboard);
reg->keyboard = NULL;
}