enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

call ecore_wl2_shutdown() in wl compositor delete callback 

shutdown/restart crash--
This commit is contained in:
Mike Blumenkrantz 2015-12-23 12:25:10 -05:00
parent 641fb52c62
commit e67f238c06
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/e_comp.c
View File

@ -1370,26 +1370,19 @@ e_comp_shutdown(void)
Eina_List *l, *ll;
E_Client *ec;
#ifdef HAVE_WAYLAND
E_Pixmap_Type type = e_comp->comp_type;
#endif
E_FREE_FUNC(action_timeout, ecore_timer_del);
EINA_LIST_FOREACH_SAFE(e_comp->clients, l, ll, ec)
{
DELD(ec, 99999);
e_object_del(E_OBJECT(ec));
}
e_object_del(E_OBJECT(e_comp));
e_comp = NULL;
E_FREE_LIST(handlers, ecore_event_handler_del);
E_FREE_LIST(actions, e_object_del);
E_FREE_LIST(hooks, e_client_hook_del);
#ifdef HAVE_WAYLAND
if (type == E_PIXMAP_TYPE_WL)
e_comp_wl_shutdown();
#endif
gl_avail = EINA_FALSE;
e_comp_cfdata_config_free(conf);
E_CONFIG_DD_FREE(conf_match_edd);

1
src/bin/e_comp_wl.c
View File

@ -1659,6 +1659,7 @@ _e_comp_wl_compositor_cb_del(void *data EINA_UNUSED)
if (output->model) eina_stringshare_del(output->model);
free(output);
}
e_comp_wl_shutdown();
/* delete fd handler */
/* if (e_comp_wl->fd_hdlr) ecore_main_fd_handler_del(e_comp_wl->fd_hdlr); */