timer23
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas: destroy seats and inputs before the display disapear.

This commit is contained in:
Cedric BAIL 2017-08-25 10:52:22 -07:00
parent dcfebcd2d9
commit 9ba662bd63
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/lib/evas/canvas/evas_main.c
View File

@ -378,6 +378,27 @@ next_zombie:
evas_event_callback_all_del(eo_e);
evas_event_callback_cleanup(eo_e);
EINA_LIST_FREE(e->touch_points, touch_point)
free(touch_point);
_evas_device_cleanup(eo_e);
e->focused_by = eina_list_free(e->focused_by);
while (e->seats)
{
Evas_Pointer_Seat *pseat = EINA_INLIST_CONTAINER_GET(e->seats, Evas_Pointer_Seat);
eina_list_free(pseat->object.in);
while (pseat->pointers)
{
Evas_Pointer_Data *pdata = EINA_INLIST_CONTAINER_GET(pseat->pointers, Evas_Pointer_Data);
pseat->pointers = eina_inlist_remove(pseat->pointers, pseat->pointers);
free(pdata);
}
e->seats = eina_inlist_remove(e->seats, e->seats);
free(pseat);
}
/* Ector surface may require an existing output to finish its job */
e->engine.func->ector_destroy(_evas_engine_context(e), e->ector);
/* cleanup engine backend */
@ -424,27 +445,6 @@ next_zombie:
}
SLKU(e->post_render.lock);
EINA_LIST_FREE(e->touch_points, touch_point)
free(touch_point);
_evas_device_cleanup(eo_e);
e->focused_by = eina_list_free(e->focused_by);
while (e->seats)
{
Evas_Pointer_Seat *pseat = EINA_INLIST_CONTAINER_GET(e->seats, Evas_Pointer_Seat);
eina_list_free(pseat->object.in);
while (pseat->pointers)
{
Evas_Pointer_Data *pdata = EINA_INLIST_CONTAINER_GET(pseat->pointers, Evas_Pointer_Data);
pseat->pointers = eina_inlist_remove(pseat->pointers, pseat->pointers);
free(pdata);
}
e->seats = eina_inlist_remove(e->seats, e->seats);
free(pseat);
}
eina_lock_free(&(e->lock_objects));
eina_spinlock_free(&(e->render.lock));
eina_spinlock_free(&(e->post_render.lock));