diff options
| author | Pekka Paalanen <ppaalanen@gmail.com> | 2012-07-10 13:05:01 +0300 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-07-10 14:08:01 -0400 |
| commit | 9326498d03c9c4b0120082387b623ad70b4205c7 (patch) | |
| tree | ea247ec0bffefdc9d904b358ff6cc1a370e69b4f /src | |
| parent | 23bf48063ff6d3150cee99715f0f1b48ebd4a82e (diff) | |
server: fix wl_seat_set_keyboard
This makes wl_seat_set_keyboard similar to wl_seat_set_pointer in that
it's a no-op, if you try to set keyboard to NULL when it already is
NULL, instead of refusing to set it to NULL ever.
Signed-off-by: Pekka Paalanen <ppaalanen@gmail.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/wayland-server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wayland-server.c b/src/wayland-server.c index 82ed326..df9bd07 100644 --- a/src/wayland-server.c +++ b/src/wayland-server.c @@ -750,7 +750,7 @@ wl_seat_set_keyboard(struct wl_seat *seat, struct wl_keyboard *keyboard) { if (keyboard && (seat->keyboard || keyboard->seat)) return; /* XXX: error? */ - if (!keyboard && seat->keyboard) + if (!keyboard && !seat->keyboard) return; seat->keyboard = keyboard; |