From 93e0ebd4e1e85b0f3d269c2a79f150560167a3b1 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 7 Apr 2015 19:30:44 -0400 Subject: [PATCH] only call e_comp_wl_shutdown() for wayland compositors --- src/bin/e_comp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c index 9a441f744..25132e5eb 100644 --- a/src/bin/e_comp.c +++ b/src/bin/e_comp.c @@ -1277,6 +1277,8 @@ e_comp_internal_save(void) EINTERN int e_comp_shutdown(void) { + E_Pixmap_Type type = e_comp->comp_type; + E_FREE_FUNC(action_timeout, ecore_timer_del); while (e_comp->clients) e_object_del(eina_list_data_get(e_comp->clients)); @@ -1285,8 +1287,9 @@ e_comp_shutdown(void) E_FREE_LIST(actions, e_object_del); E_FREE_LIST(hooks, e_client_hook_del); -#if defined(HAVE_WAYLAND_CLIENTS) || defined(HAVE_WAYLAND_ONLY) - e_comp_wl_shutdown(); +#ifdef HAVE_WAYLAND + if (type == E_PIXMAP_TYPE_WL) + e_comp_wl_shutdown(); #endif gl_avail = EINA_FALSE;