From 9326498d03c9c4b0120082387b623ad70b4205c7 Mon Sep 17 00:00:00 2001 From: Pekka Paalanen Date: Tue, 10 Jul 2012 13:05:01 +0300 Subject: [PATCH] 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 --- src/wayland-server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/wayland-server.c b/src/wayland-server.c index 82ed3260..df9bd07f 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;