From 843b5177dfa0797fe6464cdd371be276ba6246d8 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Wed, 25 Jul 2018 14:57:14 -0400 Subject: [PATCH] elementary: Check for valid frame object Summary: Make sure we have a valid frame object before calling edje & evas functions on it. This patch fixes an issue where NULL is being passed to eo functions ref T7030 Reviewers: zmike Reviewed By: zmike Subscribers: cedric, #committers Tags: #efl Maniphest Tasks: T7030 Differential Revision: https://phab.enlightenment.org/D6637 --- src/lib/elementary/efl_ui_win.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 3869c91754..ebab8fecd0 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c @@ -995,8 +995,12 @@ _elm_win_pre_render(Ecore_Evas *ee) { int mw, mh; - edje_object_thaw(sd->frame_obj); - evas_object_show(sd->frame_obj); + if (sd->type != ELM_WIN_FAKE) + { + edje_object_thaw(sd->frame_obj); + evas_object_show(sd->frame_obj); + } + _elm_win_frame_style_update(sd, 1, 1); ELM_WIN_DATA_ALIVE_CHECK(obj, sd);