summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2017-05-05 12:48:35 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2017-05-05 12:50:04 +1000
commit9d1fdb0c6deacf11bfa2e32a56ff2ce0df2291c1 (patch)
treed5ed45110f85a7b84c48dab36444a72bdc9cc871 /src
parent87b04a0cb222c6b255f247c7b76d1b6424733964 (diff)
touchpad: remove the lid switch listener on device_removed
Sequence triggered by the xorg driver, but basically: if the touchpad is destroyed before the lid switch, the event listener wasn't removed and an assertion was triggered. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src')
-rw-r--r--src/evdev-mt-touchpad.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index 8140c44..e0757e1 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -1768,6 +1768,12 @@ tp_interface_device_removed(struct evdev_device *device,
tp->dwt.keyboard = NULL;
}
+ if (removed_device == tp->lid_switch.lid_switch) {
+ libinput_device_remove_event_listener(
+ &tp->lid_switch.lid_switch_listener);
+ tp->lid_switch.lid_switch = NULL;
+ }
+
if (tp->sendevents.current_mode !=
LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE)
return;