From a5c7de04c42fe8360e519fbb2d9328d00a9ed133 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 14 Apr 2015 12:26:01 +1000 Subject: [PATCH] evdev: merge two conditions into one with a sub condition Signed-off-by: Peter Hutterer --- src/evdev.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/evdev.c b/src/evdev.c index 90f13a33..5b4b2b6b 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -151,13 +151,13 @@ evdev_pointer_notify_button(struct evdev_device *device, (state == LIBINPUT_BUTTON_STATE_RELEASED && down_count == 0)) { pointer_notify_button(&device->base, time, button, state); - if (state == LIBINPUT_BUTTON_STATE_RELEASED && - device->left_handed.change_to_enabled) - device->left_handed.change_to_enabled(device); + if (state == LIBINPUT_BUTTON_STATE_RELEASED) { + if (device->left_handed.change_to_enabled) + device->left_handed.change_to_enabled(device); - if (state == LIBINPUT_BUTTON_STATE_RELEASED && - device->scroll.change_scroll_method) - device->scroll.change_scroll_method(device); + if (device->scroll.change_scroll_method) + device->scroll.change_scroll_method(device); + } } }