diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2017-03-18 16:27:58 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-03-18 16:27:58 -0400 |
| commit | e956c61719d172f8053029e85dda046e99e8c235 (patch) | |
| tree | 23256a4f23d2c64925b3767db49d413225e1a1fe | |
| parent | Fix off-by-one error when checking workspace_layout arguments (diff) | |
| parent | Merge pull request #1121 from zandrmartin/registry-keyboard-caps (diff) | |
| download | sway-e956c61719d172f8053029e85dda046e99e8c235.tar.gz sway-e956c61719d172f8053029e85dda046e99e8c235.tar.zst sway-e956c61719d172f8053029e85dda046e99e8c235.zip | |
Merge branch 'master' into master
| -rw-r--r-- | wayland/registry.c | 2 |
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, | |||
| 193 | if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !reg->keyboard) { | 193 | if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && !reg->keyboard) { |
| 194 | reg->keyboard = wl_seat_get_keyboard(reg->seat); | 194 | reg->keyboard = wl_seat_get_keyboard(reg->seat); |
| 195 | wl_keyboard_add_listener(reg->keyboard, &keyboard_listener, reg); | 195 | wl_keyboard_add_listener(reg->keyboard, &keyboard_listener, reg); |
| 196 | } else if ((caps & WL_SEAT_CAPABILITY_KEYBOARD) && reg->keyboard) { | 196 | } else if (!(caps & WL_SEAT_CAPABILITY_KEYBOARD) && reg->keyboard) { |
| 197 | wl_keyboard_destroy(reg->keyboard); | 197 | wl_keyboard_destroy(reg->keyboard); |
| 198 | reg->keyboard = NULL; | 198 | reg->keyboard = NULL; |
| 199 | } | 199 | } |