discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d176fbc8068309182f2924e371b9e52bb309f237
commit d176fbc8068309182f2924e371b9e52bb309f237 Author: Mike Blumenkrantz <[email protected]> Date: Thu Jan 11 16:24:38 2018 -0500 efl-wl: return NULL without error when non-extracted parent is found in efl_wl_extracted_surface_extracted_parent_get() --- src/lib/efl_wl/Efl_Wl.h | 2 +- src/lib/efl_wl/efl_wl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/efl_wl/Efl_Wl.h b/src/lib/efl_wl/Efl_Wl.h index 1d86093e33..91e22b3a06 100644 --- a/src/lib/efl_wl/Efl_Wl.h +++ b/src/lib/efl_wl/Efl_Wl.h @@ -158,7 +158,7 @@ EAPI Eina_Bool efl_wl_surface_extract(Evas_Object *surface); EAPI Evas_Object *efl_wl_extracted_surface_object_find(void *surface_resource); /** - * Get the Evas_Object for an extracted surface's parent + * Get the Evas_Object for an extracted surface's parent, or NULL if the parent is not extracted * * @note Passing anything other than a valid, extracted surface guarantees a crash. * diff --git a/src/lib/efl_wl/efl_wl.c b/src/lib/efl_wl/efl_wl.c index c4a7dc5551..9dc37aa177 100644 --- a/src/lib/efl_wl/efl_wl.c +++ b/src/lib/efl_wl/efl_wl.c @@ -5628,7 +5628,7 @@ efl_wl_extracted_surface_extracted_parent_get(Evas_Object *surface) if (cs->parent) { - EINA_SAFETY_ON_FALSE_RETURN_VAL(!cs->parent->extracted, NULL); + if (!cs->parent->extracted) return NULL; return cs->parent->obj; } return NULL; --
