diff options
author | Derek Foreman <derekf@osg.samsung.com> | 2014-11-19 11:04:12 -0600 |
---|---|---|
committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2014-11-27 15:26:04 +0200 |
commit | d621df2dee522d9768a8aff1dd200f3595e29c65 (patch) | |
tree | f913c216d0c4e8bd659378997f433e0fe504baa3 /src/input.c | |
parent | 8b5211835fa7dda5ced9f7efbbe0826d8d894d94 (diff) | |
download | weston-d621df2dee522d9768a8aff1dd200f3595e29c65.tar.gz |
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>
Diffstat (limited to 'src/input.c')
-rw-r--r-- | src/input.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/input.c b/src/input.c index 15ff6ed0..c59c2697 100644 --- a/src/input.c +++ b/src/input.c @@ -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); |