discomfitor pushed a commit to branch master.

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

commit a658c785c3a9eb7771408f35fa825efdd620657d
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date:   Mon Mar 21 12:13:27 2016 -0400

    ignore xwayland clients in wl client delete request callback
    
    this breaks the compositor!
---
 src/bin/e_comp_wl.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index f74aa7f..8e6eeb0 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -659,14 +659,15 @@ _e_comp_wl_evas_cb_state_update(void *data, Evas_Object 
*obj EINA_UNUSED, void *
 static void
 _e_comp_wl_evas_cb_delete_request(void *data, Evas_Object *obj EINA_UNUSED, 
void *event EINA_UNUSED)
 {
-   E_Client *ec;
-
-   if (!(ec = data)) return;
-   if (ec->netwm.ping) e_client_ping(ec);
+   E_Client *ec = data;
 
    e_comp_ignore_win_del(E_PIXMAP_TYPE_WL, e_pixmap_window_get(ec->pixmap));
 
-   e_object_del(E_OBJECT(ec));
+   if (!e_client_has_xwindow(ec))
+     {
+        if (ec->netwm.ping) e_client_ping(ec);
+        e_object_del(E_OBJECT(ec));
+     }
 
    _e_comp_wl_focus_check();
 

-- 


Reply via email to