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

Merge branch 'master' of git+ssh://git.enlightenment.org/core/enlightenment

This commit is contained in:
Stephen 'Okra' Houston 2017-02-28 10:09:31 -06:00
parent 7d0cfacb80 933814f3a9
commit 3b3e2e9897
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/bin/e_signals.c
View File

@ -6,12 +6,8 @@
#include "e.h" #include "e.h"
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
# ifdef HAVE_WL_DRM # ifdef USE_MODULE_WL_DRM
# ifdef HAVE_DRM2 # include <Ecore_Drm2.h>
# include <Ecore_Drm2.h>
# else
# include <Ecore_Drm.h>
# endif
# endif # endif
#endif #endif
@ -75,9 +71,8 @@ _e_crash(void)
#ifdef HAVE_WAYLAND #ifdef HAVE_WAYLAND
if (e_comp->comp_type == E_PIXMAP_TYPE_WL) if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
{ {
#ifdef HAVE_WL_DRM # ifdef USE_MODULE_WL_DRM
if (!strstr(ecore_evas_engine_name_get(e_comp->ee), "drm")) return; if (!strstr(ecore_evas_engine_name_get(e_comp->ee), "drm")) return;
# ifdef HAVE_DRM2
Ecore_Drm2_Device *dev; Ecore_Drm2_Device *dev;
dev = ecore_evas_data_get(e_comp->ee, "device"); dev = ecore_evas_data_get(e_comp->ee, "device");
@ -88,23 +83,7 @@ _e_crash(void)
ecore_drm2_device_free(dev); ecore_drm2_device_free(dev);
} }
ecore_drm2_shutdown(); ecore_drm2_shutdown();
# else
const Eina_List *list, *l, *ll;
Ecore_Drm_Device *dev;
list = ecore_drm_devices_get();
EINA_LIST_FOREACH_SAFE(list, l, ll, dev)
{
ecore_drm_inputs_destroy(dev);
ecore_drm_sprites_destroy(dev);
ecore_drm_device_close(dev);
ecore_drm_launcher_disconnect(dev);
ecore_drm_device_free(dev);
}
ecore_drm_shutdown();
# endif # endif
#endif
return; return;
} }
#endif #endif