when e crashes in wayland, just crash instead of possibly freezing

This commit is contained in:
Mike Blumenkrantz 2015-07-09 15:11:13 -04:00
parent 399e3c79ce
commit 884068ff9d
1 changed files with 20 additions and 15 deletions

View File

@ -5,7 +5,7 @@
*/
#include "e.h"
#ifdef HAVE_WAYLAND_ONLY
#ifdef HAVE_WAYLAND
#include <Ecore_Drm.h>
#endif
@ -66,7 +66,9 @@ _e_write_safe_int(int fd, const char *buf, size_t size)
static void
_e_crash(void)
{
#ifdef HAVE_WAYLAND_ONLY
#ifdef HAVE_WAYLAND
if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
{
const Eina_List *list, *l, *ll;
Ecore_Drm_Device *dev;
@ -81,7 +83,10 @@ _e_crash(void)
}
ecore_drm_shutdown();
#else
return;
}
#endif
#ifndef HAVE_WAYLAND_ONLY
_e_x_composite_shutdown();
ecore_x_pointer_ungrab();
ecore_x_keyboard_ungrab();