discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=7e05eff3e3095ca305dd03e5f7f88b529ab70f1f
commit 7e05eff3e3095ca305dd03e5f7f88b529ab70f1f Author: Mike Blumenkrantz <[email protected]> Date: Wed Mar 22 16:15:15 2017 -0400 only apply xdg-shell client del hooks to internal clients ref 8173c06c4d666248650c75616cad35ed5b63500e --- src/modules/wl_desktop_shell/xdg5.c | 4 ++-- src/modules/wl_desktop_shell/xdg6.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/wl_desktop_shell/xdg5.c b/src/modules/wl_desktop_shell/xdg5.c index 4eb354d..636be87 100644 --- a/src/modules/wl_desktop_shell/xdg5.c +++ b/src/modules/wl_desktop_shell/xdg5.c @@ -895,8 +895,8 @@ _xdg5_client_hook_del(void *d EINA_UNUSED, E_Client *ec) if (e_pixmap_type_get(ec->pixmap) != E_PIXMAP_TYPE_WL) return; shd = ec->comp_data->shell.data; - if (shd && (shd->version != 5)) return; - if (ec->comp_data->shell.surface) + if (shd && (shd->version != 5)) return; + if (ec->internal && ec->comp_data->shell.surface) wl_resource_destroy(ec->comp_data->shell.surface); } diff --git a/src/modules/wl_desktop_shell/xdg6.c b/src/modules/wl_desktop_shell/xdg6.c index bf6e831..1447ceb 100644 --- a/src/modules/wl_desktop_shell/xdg6.c +++ b/src/modules/wl_desktop_shell/xdg6.c @@ -1444,7 +1444,8 @@ _e_xdg_shell_cb_bind(struct wl_client *client, void *data EINA_UNUSED, uint32_t static void _xdg6_client_hook_del(void *d EINA_UNUSED, E_Client *ec) { - _xdg6_client_destroy(ec, 1); + if (ec->internal) + _xdg6_client_destroy(ec, 1); } EINTERN Eina_Bool --
