diff options
| author | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-11-08 08:45:31 +0000 |
|---|---|---|
| committer | Carsten Haitzler (Rasterman) <raster@rasterman.com> | 2019-11-08 08:45:31 +0000 |
| commit | 6375d1a7260aca7575438fecf372792dd5242044 (patch) | |
| tree | a8d5edcb4038659745f203fdf77c7c66e5593f40 | |
| parent | 59e5ff63b59fbab0b649f9f03821a08e8479eae9 (diff) | |
| download | enlightenment-6375d1a7260aca7575438fecf372792dd5242044.tar.gz | |
err logs - fix up some of the err logs i see accessing invalid objects
| -rw-r--r-- | src/bin/e_client.c | 7 | ||||
| -rw-r--r-- | src/bin/e_comp_object.c | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/bin/e_client.c b/src/bin/e_client.c index abd2742c07..c1d84835b1 100644 --- a/src/bin/e_client.c +++ b/src/bin/e_client.c @@ -2840,8 +2840,11 @@ e_client_desk_set(E_Client *ec, E_Desk *desk) } old_desk = ec->desk; ec->desk = desk; - e_comp_object_effect_unclip(ec->frame); - e_comp_object_effect_set(ec->frame, NULL); + if (ec->frame) + { + e_comp_object_effect_unclip(ec->frame); + e_comp_object_effect_set(ec->frame, NULL); + } if (desk->visible || ec->sticky) { // force visibility if its a stack window going onto this desktop diff --git a/src/bin/e_comp_object.c b/src/bin/e_comp_object.c index d52ea2bf13..14d3a6492d 100644 --- a/src/bin/e_comp_object.c +++ b/src/bin/e_comp_object.c @@ -663,7 +663,7 @@ _e_comp_object_shadow_setup(E_Comp_Object *cw) { if (cw->zoomap_disabled) { - if (cw->frame_object && (e_zoomap_child_get(cw->zoomobj) == cw->frame_object)) return EINA_FALSE; + if (cw->frame_object && (cw->zoomobj && e_zoomap_child_get(cw->zoomobj) == cw->frame_object)) return EINA_FALSE; } else { @@ -2989,7 +2989,6 @@ e_comp_object_util_del_list_append(Evas_Object *obj, Evas_Object *to_del) { Eina_List *l; - SOFT_ENTRY(); EINA_SAFETY_ON_NULL_RETURN(to_del); l = evas_object_data_get(obj, "comp_object-to_del"); evas_object_data_set(obj, "comp_object-to_del", eina_list_append(l, to_del)); @@ -3178,12 +3177,15 @@ E_API void e_comp_object_util_center_on(Evas_Object *obj, Evas_Object *on) { int x, y, w, h, ow, oh; - E_Comp_Object *cw2; + E_Comp_Object *cw2 = NULL; + const char *type; SOFT_ENTRY(); EINA_SAFETY_ON_NULL_RETURN(on); - cw2 = evas_object_smart_data_get(on); + type = evas_object_type_get(on); + if ((type) && (!strcmp(type, "e_comp_object"))) + cw2 = evas_object_smart_data_get(on); if (cw2 && eina_streq(evas_object_type_get(on), SMART_NAME)) x = cw2->ec->x, y = cw2->ec->y, w = cw2->ec->w, h = cw2->ec->h; else |