mirror of
https://gitlab.freedesktop.org/wayland/weston
synced 2024-09-06 18:05:39 +00:00
input: Use slightly less obscure logic in evdev_notify_keyboard_focus()
While the test is actually correct (for non-negative numbers), it's not at all clear and seems to be an accidental order of operations mistake. Also, add an assert() to make sure this number is never negative. Closes bug 86346 - https://bugs.freedesktop.org/show_bug.cgi?id=86346 Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
This commit is contained in:
parent
8b5211835f
commit
d621df2dee
|
@ -2168,6 +2168,7 @@ WL_EXPORT void
|
|||
weston_seat_release_keyboard(struct weston_seat *seat)
|
||||
{
|
||||
seat->keyboard_device_count--;
|
||||
assert(seat->keyboard_device_count >= 0);
|
||||
if (seat->keyboard_device_count == 0) {
|
||||
weston_keyboard_set_focus(seat->keyboard, NULL);
|
||||
weston_keyboard_cancel_grab(seat->keyboard);
|
||||
|
|
|
@ -470,7 +470,7 @@ evdev_notify_keyboard_focus(struct weston_seat *seat,
|
|||
{
|
||||
struct wl_array keys;
|
||||
|
||||
if (!seat->keyboard_device_count > 0)
|
||||
if (seat->keyboard_device_count == 0)
|
||||
return;
|
||||
|
||||
wl_array_init(&keys);
|
||||
|
|
Loading…
Reference in a new issue