diff options
| author | Mike Blumenkrantz <zmike@samsung.com> | 2019-03-19 10:00:21 -0400 |
|---|---|---|
| committer | Cedric BAIL <cedric.bail@free.fr> | 2019-03-20 12:36:59 -0700 |
| commit | 5930c5f86ed5bee870d1fab8e501d4dab20ba2f6 (patch) | |
| tree | 0c1035f7f718d8077a83adf84d8d461689e71393 | |
| parent | fcf2eb2205cc3cb9a1b3217c7bbba961bb8b2804 (diff) | |
| download | efl-5930c5f86ed5bee870d1fab8e501d4dab20ba2f6.tar.gz | |
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 <cedric.bail@free.fr>
Differential Revision: https://phab.enlightenment.org/D8401
| -rw-r--r-- | src/lib/elementary/efl_ui_win.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 6e60b13633..26c135b356 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -5861,7 +5861,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; |