aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/elementary/efl_ui_win.c
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2018-06-19 13:40:43 -0400
committerMike Blumenkrantz <zmike@samsung.com>2018-06-19 13:40:43 -0400
commit13b702816e34a3337058431f1d383d5adb681f16 (patch)
treea53f5112dfb27638ace45e18382d309f4cbc78f4 /src/lib/elementary/efl_ui_win.c
parentefl_ui_win: do not attempt to focus a null object on focus-in (diff)
downloadefl-13b702816e34a3337058431f1d383d5adb681f16.tar.gz
efl_ui_win: check frame_obj existence before operating on it in pre_render
Summary: this object will not exist for fake win objects, e.g., in enlightenment fix https://phab.enlightenment.org/T7033 Depends on https://phab.enlightenment.org/D6319 Reviewers: bu5hm4n, Hermet, woohyun, devilhorns Reviewed By: bu5hm4n Subscribers: cedric, #committers Tags: #efl Maniphest Tasks: https://phab.enlightenment.org/T7033 Differential Revision: https://phab.enlightenment.org/D6320
Diffstat (limited to 'src/lib/elementary/efl_ui_win.c')
-rw-r--r--src/lib/elementary/efl_ui_win.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 60f8600bfe..9a662c43b7 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1008,9 +1008,12 @@ _elm_win_pre_render(Ecore_Evas *ee)
*/
sd->deferred_resize_job = EINA_TRUE;
- /* force initial sizing on frame to enable sizing of content */
- edje_object_size_min_calc(sd->frame_obj, &mw, &mh);
- evas_object_resize(sd->frame_obj, mw, mh);
+ if (sd->frame_obj)
+ {
+ /* force initial sizing on frame to enable sizing of content */
+ edje_object_size_min_calc(sd->frame_obj, &mw, &mh);
+ evas_object_resize(sd->frame_obj, mw, mh);
+ }
if (sd->img_obj)
{