discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d529d6def632d95428c38459edc9f57a36465750
commit d529d6def632d95428c38459edc9f57a36465750 Author: Mike Blumenkrantz <[email protected]> Date: Fri Jul 28 15:44:43 2017 -0400 elput: fix seat cleanup ensure seat deletion does not conflict with elput shutdown @fix --- src/lib/elput/elput_input.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/lib/elput/elput_input.c b/src/lib/elput/elput_input.c index 90246119e0..5134a67635 100644 --- a/src/lib/elput/elput_input.c +++ b/src/lib/elput/elput_input.c @@ -123,8 +123,14 @@ _udev_seat_destroy(Elput_Seat *eseat) _evdev_device_destroy(edev); if (eseat->kbd) _evdev_keyboard_destroy(eseat->kbd); + eseat->kbd = NULL; if (eseat->ptr) _evdev_pointer_destroy(eseat->ptr); + eseat->ptr = NULL; if (eseat->touch) _evdev_touch_destroy(eseat->touch); + eseat->touch = NULL; + if (eseat->manager->input.seats) + eseat->manager->input.seats = eina_list_remove(eseat->manager->input.seats, eseat); + if (eseat->refs) return; eina_stringshare_del(eseat->name); free(eseat); @@ -429,12 +435,13 @@ EAPI void elput_input_shutdown(Elput_Manager *manager) { Elput_Seat *seat; + Eina_List *l, *ll; EINA_SAFETY_ON_NULL_RETURN(manager); ecore_main_fd_handler_del(manager->input.hdlr); - EINA_LIST_FREE(manager->input.seats, seat) + EINA_LIST_FOREACH_SAFE(manager->input.seats, l, ll, seat) _udev_seat_destroy(seat); if (manager->input.thread) --
