From 251be4ece39de8f4e293d6543d57c0ab501b2210 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 19 Mar 2019 10:00:21 -0400 Subject: [PATCH] efl_ui_win: avoid triggering legacy forbidden path during window finalize this (unintentionally) revealed some bugs where apps/examples were mixing eo and legacy code for elm_win which breaks things pretty badly. I'm only here so I don't get fined. ref T7713 Reviewed-by: Cedric BAIL Differential Revision: https://phab.enlightenment.org/D8401 --- src/lib/elementary/efl_ui_win.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 8a60a2e..424cc59 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -6873,7 +6873,8 @@ _efl_ui_win_efl_object_finalize(Eo *obj, Efl_Ui_Win_Data *sd) if (obj && (!elm_widget_is_legacy(obj))) { /* FIXME: if parts other than background are supported then this should change */ - if (efl_file_get(efl_part(obj, "background")) || efl_file_mmap_get(efl_part(obj, "background"))) + if (efl_file_get(efl_super(efl_part(obj, "background"), EFL_UI_WIN_PART_CLASS)) || + efl_file_mmap_get(efl_super(efl_part(obj, "background"), EFL_UI_WIN_PART_CLASS))) efl_file_load(efl_part(obj, "background")); } return obj; -- 2.7.4