forked from enlightenment/efl
parent
1284e077ad
commit
6e0f9db089
|
@ -453,30 +453,33 @@ evas_object_image_source_set(Evas_Object *obj, Evas_Object *src)
|
|||
abort();
|
||||
return EINA_FALSE;
|
||||
}
|
||||
if (src->delete_me)
|
||||
if (src)
|
||||
{
|
||||
CRIT("Setting object %p to deleted image source %p", src, obj);
|
||||
abort();
|
||||
return EINA_FALSE;
|
||||
}
|
||||
if (!src->layer)
|
||||
{
|
||||
CRIT("No evas surface associated with source object (%p)", obj);
|
||||
abort();
|
||||
return EINA_FALSE;
|
||||
}
|
||||
if ((obj->layer && src->layer) &&
|
||||
(obj->layer->evas != src->layer->evas))
|
||||
{
|
||||
CRIT("Setting object %p from Evas (%p) from another Evas (%p)", src, src->layer->evas, obj->layer->evas);
|
||||
abort();
|
||||
return EINA_FALSE;
|
||||
}
|
||||
if (src == obj)
|
||||
{
|
||||
CRIT("Setting object %p as a source for itself", obj);
|
||||
abort();
|
||||
return EINA_FALSE;
|
||||
if (src->delete_me)
|
||||
{
|
||||
CRIT("Setting object %p to deleted image source %p", src, obj);
|
||||
abort();
|
||||
return EINA_FALSE;
|
||||
}
|
||||
if (!src->layer)
|
||||
{
|
||||
CRIT("No evas surface associated with source object (%p)", obj);
|
||||
abort();
|
||||
return EINA_FALSE;
|
||||
}
|
||||
if ((obj->layer && src->layer) &&
|
||||
(obj->layer->evas != src->layer->evas))
|
||||
{
|
||||
CRIT("Setting object %p from Evas (%p) from another Evas (%p)", src, src->layer->evas, obj->layer->evas);
|
||||
abort();
|
||||
return EINA_FALSE;
|
||||
}
|
||||
if (src == obj)
|
||||
{
|
||||
CRIT("Setting object %p as a source for itself", obj);
|
||||
abort();
|
||||
return EINA_FALSE;
|
||||
}
|
||||
}
|
||||
if (o->cur.source == src) return EINA_TRUE;
|
||||
|
||||
|
@ -485,10 +488,7 @@ evas_object_image_source_set(Evas_Object *obj, Evas_Object *src)
|
|||
if (o->cur.file || o->cur.key)
|
||||
evas_object_image_file_set(obj, NULL, NULL);
|
||||
|
||||
if (src)
|
||||
{
|
||||
_proxy_set(obj, src);
|
||||
}
|
||||
if (src) _proxy_set(obj, src);
|
||||
|
||||
return EINA_TRUE;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue