NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cnp should only attempt to get wl win for wl engine canvases 

fixes abort() on missing wl ee interface
This commit is contained in:
Mike Blumenkrantz 2015-03-05 11:31:30 -05:00
parent d3d3cbf915
commit 8384b0a0f7
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
legacy/elementary/src/lib/elm_cnp.c
View File

@ -3560,27 +3560,25 @@ _wl_elm_widget_window_get(Evas_Object *obj)
{
Ecore_Evas *ee;
Evas *evas;
const char *engine_name;
if (!(evas = evas_object_evas_get(obj)))
return 0;
if (!(ee = ecore_evas_ecore_evas_get(evas)))
return 0;
while(!win)
engine_name = ecore_evas_engine_name_get(ee);
if (!strcmp(engine_name, ELM_BUFFER))
{
const char *engine_name = ecore_evas_engine_name_get(ee);
if (!strcmp(engine_name, ELM_BUFFER))
{
ee = ecore_evas_buffer_ecore_evas_parent_get(ee);
if (!ee) return 0;
win = ecore_evas_wayland_window_get(ee);
}
else
{
/* In case the engine is not a buffer, we want to check once. */
win = ecore_evas_wayland_window_get(ee);
if (!win) return 0;
}
ee = ecore_evas_buffer_ecore_evas_parent_get(ee);
if (!ee) return 0;
win = ecore_evas_wayland_window_get(ee);
}
else if (!strncmp(engine_name, "wayland", sizeof("wayland") - 1))
{
/* In case the engine is not a buffer, we want to check once. */
win = ecore_evas_wayland_window_get(ee);
if (!win) return 0;
}
}