summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2016-07-21 14:29:20 -0500
committerDerek Foreman <derekf@osg.samsung.com>2016-07-21 14:29:20 -0500
commit926d9ab6d80dffcc871d571cdff583107e0158b9 (patch)
tree0b12273ca9ccfa90fcd7c9c56b3645165e2b0299
parent0680250d720649a95fd3d9631c7baf6829a1a665 (diff)
downloadenlightenment-926d9ab6d80dffcc871d571cdff583107e0158b9.tar.gz
Fix test for object visibility when deleting wayland clients
In the very last commit I got the visibility check wrong. ref 0680250d720649a95fd3d9631c7baf6829a1a665
-rw-r--r--src/bin/e_comp_wl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/e_comp_wl.c b/src/bin/e_comp_wl.c
index dbf6b482b7..e9bd6448a2 100644
--- a/src/bin/e_comp_wl.c
+++ b/src/bin/e_comp_wl.c
@@ -2469,14 +2469,14 @@ _e_comp_wl_client_cb_del(void *data EINA_UNUSED, E_Client *ec)
wl_resource_set_user_data(ec->comp_data->surface, NULL);
}
- if (ec->internal_elm_win)
- evas_object_hide(ec->frame);
-
/* WL clients take an extra ref at startup so they don't get deleted while
* visible. Since we drop that in the render loop we need to make sure
* it's dropped here if the client isn't going to be rendered.
*/
- if (!e_pixmap_is_x(ec->pixmap) && ec->hidden) e_object_unref(E_OBJECT(ec));
+ if (!evas_object_visible_get(ec->frame)) e_object_unref(E_OBJECT(ec));
+
+ if (ec->internal_elm_win)
+ evas_object_hide(ec->frame);
_e_comp_wl_focus_check();
}