summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2019-05-29 09:17:00 -0400
committerMike Blumenkrantz <zmike@samsung.com>2019-05-29 12:29:03 -0400
commitb265bb0e2be73ded38a2c019148f80851da18c32 (patch)
tree34ef7582445099dbb686cfe34de87878191c40d6
parentd09edd72422effdf54d5219c942ce32207c81c38 (diff)
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
-rw-r--r--src/lib/elementary/elm_colorselector.c3
1 files changed, 3 insertions, 0 deletions
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
1333 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS)); 1333 int_ret = efl_ui_widget_theme_apply(efl_super(obj, MY_CLASS));
1334 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret; 1334 if (int_ret == EFL_UI_THEME_APPLY_ERROR_GENERIC) return int_ret;
1335 1335
1336 /* none of the below objects are created before finalize */
1337 if (!efl_finalized_get(obj)) return int_ret;
1338
1336 if ((sd->mode == ELM_COLORSELECTOR_PALETTE) || 1339 if ((sd->mode == ELM_COLORSELECTOR_PALETTE) ||
1337 (sd->mode == ELM_COLORSELECTOR_ALL) || 1340 (sd->mode == ELM_COLORSELECTOR_ALL) ||
1338 (sd->mode == ELM_COLORSELECTOR_BOTH)) 1341 (sd->mode == ELM_COLORSELECTOR_BOTH))