From 4fc493535e076cc84705f3070b42dff07b1cf5e5 Mon Sep 17 00:00:00 2001 From: raster Date: Tue, 3 May 2011 09:10:10 +0000 Subject: [PATCH] aaaaah fix my fix for preloading multi-target entry stuff to call per preload target again (fix shortcut) git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@59143 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_object_image.c | 6 +++++- src/lib/canvas/evas_object_inform.c | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/lib/canvas/evas_object_image.c b/src/lib/canvas/evas_object_image.c index 889a562..9d27986 100644 --- a/src/lib/canvas/evas_object_image.c +++ b/src/lib/canvas/evas_object_image.c @@ -1007,10 +1007,10 @@ evas_object_image_preload(Evas_Object *obj, Eina_Bool cancel) { if (!o->preloading) { + o->preloading = 1; obj->layer->evas->engine.func->image_data_preload_request(obj->layer->evas->engine.data.output, o->engine_data, obj); - o->preloading = 1; } } } @@ -3420,6 +3420,10 @@ Eina_Bool _evas_object_image_preloading_get(const Evas_Object *obj) { Evas_Object_Image *o = (Evas_Object_Image *)(obj->object_data); + if (!o) return EINA_FALSE; + MAGIC_CHECK(o, Evas_Object_Image, MAGIC_OBJ_IMAGE); + return EINA_FALSE; + MAGIC_CHECK_END(); return o->preloading; } diff --git a/src/lib/canvas/evas_object_inform.c b/src/lib/canvas/evas_object_inform.c index 25d3391..f22b6f0 100644 --- a/src/lib/canvas/evas_object_inform.c +++ b/src/lib/canvas/evas_object_inform.c @@ -61,11 +61,11 @@ void evas_object_inform_call_image_preloaded(Evas_Object *obj) { if (!_evas_object_image_preloading_get(obj)) return; + _evas_object_image_preloading_set(obj, 0); _evas_object_event_new(); evas_object_event_callback_call(obj, EVAS_CALLBACK_IMAGE_PRELOADED, NULL); _evas_post_event_callback_call(obj->layer->evas); - _evas_object_image_preloading_set(obj, 0); } void -- 2.7.4