mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

input: Stop leaking libinput event source on session deactivation

Browse Source 
This is easily noticed as a leaked fd on every VC switch.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
This commit is contained in:
Derek Foreman
2017-07-25 16:39:20 -05:00
committed by Pekka Paalanen
parent 6b65d8f120
commit 0e4e570cae
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/libinput-seat.c
+4 -1
View File
@@ -134,6 +134,8 @@ udev_input_disable(struct udev_input *input)
if (input->suspended) if (input->suspended)
return; return;
wl_event_source_remove(input->libinput_source);
input->libinput_source = NULL;
libinput_suspend(input->libinput); libinput_suspend(input->libinput);
process_events(input); process_events(input);
input->suspended = 1; input->suspended = 1;
@@ -337,7 +339,8 @@ udev_input_destroy(struct udev_input *input)
{ {
struct udev_seat *seat, *next; struct udev_seat *seat, *next;
wl_event_source_remove(input->libinput_source); if (input->libinput_source)
wl_event_source_remove(input->libinput_source);
wl_list_for_each_safe(seat, next, &input->compositor->seat_list, base.link) wl_list_for_each_safe(seat, next, &input->compositor->seat_list, base.link)
udev_seat_destroy(seat); udev_seat_destroy(seat);
libinput_unref(input->libinput); libinput_unref(input->libinput);