discomfitor pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=2c1e864fbc4f2bd421029785306764da9328663b

commit 2c1e864fbc4f2bd421029785306764da9328663b
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Tue Apr 26 08:58:50 2016 -0400

    move wayland surface E_Client del check to a place where it's more useful
    
    completely breaks wayland on first commit? off to an auspicious start!
    
    ref d9679f765f266448448e1d3707ecf374bcaec6fe
---
 src/bin/e_comp_wl.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index 639119a..16114da 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -1567,8 +1567,6 @@ _e_comp_wl_compositor_cb_surface_create(struct wl_client 
*client, struct wl_reso
 
    DBG("Compositor Cb Surface Create: %d", id);
 
-   if (e_object_is_del(E_OBJECT(ec))) return;
-
    /* try to create an internal surface */
    if (!(res = wl_resource_create(client, &wl_surface_interface,
                                   wl_resource_get_version(resource), id)))
@@ -1587,7 +1585,11 @@ _e_comp_wl_compositor_cb_surface_create(struct wl_client 
*client, struct wl_reso
    wl_client_get_credentials(client, &pid, NULL, NULL);
    if (pid == getpid()) //internal!
      ec = e_pixmap_find_client(E_PIXMAP_TYPE_WL, (uintptr_t)id);
-   if (!ec)
+   if (ec)
+     {
+        if (e_object_is_del(E_OBJECT(ec))) return;
+     }
+   else
      {
         E_Pixmap *ep = NULL;
 

-- 


Reply via email to