[EGIT] [core/enlightenment] master 02/02: only apply xwl client deletion to xwl clients in x11 compositor

[Mike Blumenkrantz]

discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=6323d0fb516f611b5cce22e976269ff222762f28

commit 6323d0fb516f611b5cce22e976269ff222762f28
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Thu Jul 2 16:49:19 2015 -0400

    only apply xwl client deletion to xwl clients in x11 compositor
---
 src/bin/e_comp_x.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/bin/e_comp_x.c b/src/bin/e_comp_x.c
index 5b4d400..7998eca 100644
--- a/src/bin/e_comp_x.c
+++ b/src/bin/e_comp_x.c
@@ -4390,12 +4390,15 @@ _e_comp_x_hook_client_del(void *d EINA_UNUSED, E_Client 
*ec)
    if (cd)
      E_FREE_FUNC(cd->first_draw_delay, ecore_timer_del);
 #ifdef HAVE_WAYLAND
-   if (e_pixmap_is_x(ec->pixmap))
-     e_comp_wl_client_xwayland_setup(ec, NULL, NULL);
-   else
+   if (e_comp->comp_type == E_PIXMAP_TYPE_WL)
      {
-        free(cd);
-        e_pixmap_free(_e_comp_x_client_pixmap_get(ec));
+        if (e_pixmap_is_x(ec->pixmap))
+          e_comp_wl_client_xwayland_setup(ec, NULL, NULL);
+        else
+          {
+             free(cd);
+             e_pixmap_free(_e_comp_x_client_pixmap_get(ec));
+          }
      }
 #endif
    if (post_clients)

--