{
layer = evas_object_layer_get(o);
cw2 = evas_object_data_get(o, "comp_obj");
+ if (cw2)
+ if (!cw2->ec || e_object_is_del(E_OBJECT(cw2->ec)))
+ cw2 = NULL;
while (!cw2)
{
if (!e_util_strcmp(evas_object_name_get(o), "layer_obj")) break;
if (ec) o = ec->frame;
}
- if (o) cw2 = evas_object_data_get(o, "comp_obj");
+ if (o)
+ {
+ cw2 = evas_object_data_get(o, "comp_obj");
+ if (cw2)
+ if (!cw2->ec || e_object_is_del(E_OBJECT(cw2->ec)))
+ cw2 = NULL;
+ }
}
}
}
cw2 = evas_object_data_get(o, "comp_obj");
+ if (cw2)
+ if (!cw2->ec || e_object_is_del(E_OBJECT(cw2->ec)))
+ cw2 = NULL;
/* assume someone knew what they were doing during client init */
if (cw->ec->new_client)
o = ec->frame;
//else //wat
}
- if (o) cw2 = evas_object_data_get(o, "comp_obj");
+ if (o)
+ {
+ cw2 = evas_object_data_get(o, "comp_obj");
+ if (cw2)
+ if (!cw2->ec || e_object_is_del(E_OBJECT(cw2->ec)))
+ cw2 = NULL;
+ }
}
if (cw2 && cw->layer != cw2->layer)