discomfitor pushed a commit to branch enlightenment-0.20.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=5e27e5f30232d189734409fc81a16fc746d36317
commit 5e27e5f30232d189734409fc81a16fc746d36317
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 61883b0..47ada79 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -660,14 +660,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();
--
