summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <devilhorns@comcast.net>2018-07-25 14:57:14 -0400
committerChris Michael <cp.michael@samsung.com>2018-07-25 14:57:14 -0400
commit843b5177dfa0797fe6464cdd371be276ba6246d8 (patch)
treec3397f7ce35ab3df658d77f34fb82969d89608b1
parent6fbcff15db98d18e9c867c36d1cb1770cba4299d (diff)
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
-rw-r--r--src/lib/elementary/efl_ui_win.c8
1 files 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)
995 { 995 {
996 int mw, mh; 996 int mw, mh;
997 997
998 edje_object_thaw(sd->frame_obj); 998 if (sd->type != ELM_WIN_FAKE)
999 evas_object_show(sd->frame_obj); 999 {
1000 edje_object_thaw(sd->frame_obj);
1001 evas_object_show(sd->frame_obj);
1002 }
1003
1000 _elm_win_frame_style_update(sd, 1, 1); 1004 _elm_win_frame_style_update(sd, 1, 1);
1001 ELM_WIN_DATA_ALIVE_CHECK(obj, sd); 1005 ELM_WIN_DATA_ALIVE_CHECK(obj, sd);
1002 1006