summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/e_comp.c9
-rw-r--r--src/bin/e_comp_wl.c1
2 files changed, 2 insertions, 8 deletions
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 68c4e42f4..9facdd057 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -1370,26 +1370,19 @@ e_comp_shutdown(void)
1370 Eina_List *l, *ll; 1370 Eina_List *l, *ll;
1371 E_Client *ec; 1371 E_Client *ec;
1372 1372
1373#ifdef HAVE_WAYLAND
1374 E_Pixmap_Type type = e_comp->comp_type;
1375#endif
1376 E_FREE_FUNC(action_timeout, ecore_timer_del); 1373 E_FREE_FUNC(action_timeout, ecore_timer_del);
1377 EINA_LIST_FOREACH_SAFE(e_comp->clients, l, ll, ec) 1374 EINA_LIST_FOREACH_SAFE(e_comp->clients, l, ll, ec)
1378 { 1375 {
1379 DELD(ec, 99999); 1376 DELD(ec, 99999);
1380 e_object_del(E_OBJECT(ec)); 1377 e_object_del(E_OBJECT(ec));
1381 } 1378 }
1379
1382 e_object_del(E_OBJECT(e_comp)); 1380 e_object_del(E_OBJECT(e_comp));
1383 e_comp = NULL; 1381 e_comp = NULL;
1384 E_FREE_LIST(handlers, ecore_event_handler_del); 1382 E_FREE_LIST(handlers, ecore_event_handler_del);
1385 E_FREE_LIST(actions, e_object_del); 1383 E_FREE_LIST(actions, e_object_del);
1386 E_FREE_LIST(hooks, e_client_hook_del); 1384 E_FREE_LIST(hooks, e_client_hook_del);
1387 1385
1388#ifdef HAVE_WAYLAND
1389 if (type == E_PIXMAP_TYPE_WL)
1390 e_comp_wl_shutdown();
1391#endif
1392
1393 gl_avail = EINA_FALSE; 1386 gl_avail = EINA_FALSE;
1394 e_comp_cfdata_config_free(conf); 1387 e_comp_cfdata_config_free(conf);
1395 E_CONFIG_DD_FREE(conf_match_edd); 1388 E_CONFIG_DD_FREE(conf_match_edd);
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 52504de8e..1f5ff90a6 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1659,6 +1659,7 @@ _e_comp_wl_compositor_cb_del(void *data EINA_UNUSED)
1659 if (output->model) eina_stringshare_del(output->model); 1659 if (output->model) eina_stringshare_del(output->model);
1660 free(output); 1660 free(output);
1661 } 1661 }
1662 e_comp_wl_shutdown();
1662 1663
1663 /* delete fd handler */ 1664 /* delete fd handler */
1664 /* if (e_comp_wl->fd_hdlr) ecore_main_fd_handler_del(e_comp_wl->fd_hdlr); */ 1665 /* if (e_comp_wl->fd_hdlr) ecore_main_fd_handler_del(e_comp_wl->fd_hdlr); */