From 17e34d4ecb924567278cb1ac1ccde1e6b8d576bb Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Tue, 3 Nov 2020 11:23:48 +0900 Subject: [PATCH] Revert "subsurface: fix mistake caused by previous patch." This reverts commit a1cc2617a4c8c9d38e25fe5c5603a41e60a39ef8. Change-Id: Ibd488f567dab0edba993053ae7a46690997c6479 --- src/bin/e_comp_wl_subsurface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/e_comp_wl_subsurface.c b/src/bin/e_comp_wl_subsurface.c index ac3abdc677..05430f0a71 100644 --- a/src/bin/e_comp_wl_subsurface.c +++ b/src/bin/e_comp_wl_subsurface.c @@ -676,7 +676,7 @@ _e_comp_wl_subsurface_cb_place_above(struct wl_client *client EINA_UNUSED, struc if (!_subsurface_sibling_check(ec, ecs)) { - wl_resource_post_error(cdata->sub.data->resource, + wl_resource_post_error(ecs_cdata->sub.data->resource, WL_SUBSURFACE_ERROR_BAD_SURFACE, "%s: wl_surface@%d is not a parent or sibling", "place_above", wl_resource_get_id(ecs_cdata->surface)); @@ -721,10 +721,12 @@ _e_comp_wl_subsurface_cb_place_below(struct wl_client *client EINA_UNUSED, struc if (!(ecs = wl_resource_get_user_data(sibling_resource))) return; ecs_cdata = e_client_cdata_get(ecs); if (!ecs_cdata) return; + if (!ecs_cdata->sub.data) return; + if (!_subsurface_sibling_check(ec, ecs)) { - wl_resource_post_error(cdata->sub.data->resource, + wl_resource_post_error(ecs_cdata->sub.data->resource, WL_SUBSURFACE_ERROR_BAD_SURFACE, "%s: wl_surface@%d is not a parent or sibling", "place_below", wl_resource_get_id(ecs_cdata->surface)); -- 2.34.1