enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

elput: fix seat cleanup 

ensure seat deletion does not conflict with elput shutdown

@fix
This commit is contained in:
Mike Blumenkrantz 2017-07-28 15:44:43 -04:00
parent ea4ae11023
commit d529d6def6
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/elput/elput_input.c
View File

@ -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)