From b265bb0e2be73ded38a2c019148f80851da18c32 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 29 May 2019 09:17:00 -0400 Subject: [PATCH] elm/colorselector: return early from theme apply if object is not yet finalized Summary: the remainder of this function cannot be handled until objects are set up later in construction @fix Depends on D8955 Reviewers: devilhorns Reviewed By: devilhorns Subscribers: devilhorns, cedric, #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D8956 --- src/lib/elementary/elm_colorselector.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c index 0937836750..2ca5b09c5d 100644 --- a/src/lib/elementary/elm_colorselector.c +++ b/src/lib/elementary/elm_colorselector.c @@ -1333,6 +1333,9 @@ _elm_colorselector_efl_ui_widget_theme_apply(Eo *obj, Elm_Colorselector_Data *sd int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; + /* none of the below objects are created before finalize */ + if (!efl_finalized_get(obj)) return int_ret; + if ((sd->mode == ELM_COLORSELECTOR_PALETTE) || (sd->mode == ELM_COLORSELECTOR_ALL) || (sd->mode == ELM_COLORSELECTOR_BOTH))