summaryrefslogtreecommitdiff
path: root/src/lib/evas/cache2
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2013-06-04 19:40:36 +0900
committerCedric Bail <cedric.bail@samsung.com>2013-06-04 20:20:55 +0900
commita5329fc680101df9234df44f61b0db2fc42f8a7c (patch)
treeabfe6dc16d51f1985c4ffa4ff393cc2a7af08e4c /src/lib/evas/cache2
parent20834f09251c41c1e06ff2d2ff9c4c2e31ffd890 (diff)
evas/cserve2: add lots of error checks in the client side.
It seems some images are fully loaded even when we request only preload. The load handler will take care of both cases anyway. Signed-off-by: Cedric Bail <cedric.bail@samsung.com>
Diffstat (limited to 'src/lib/evas/cache2')
-rw-r--r--src/lib/evas/cache2/evas_cache2.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/evas/cache2/evas_cache2.c b/src/lib/evas/cache2/evas_cache2.c
index a819e385ea..e84b41deb2 100644
--- a/src/lib/evas/cache2/evas_cache2.c
+++ b/src/lib/evas/cache2/evas_cache2.c
@@ -945,11 +945,12 @@ evas_cache2_image_load_data(Image_Entry *ie)
945 ie->file, ie->key ? ie->key : ""); 945 ie->file, ie->key ? ie->key : "");
946 if (evas_cserve2_image_data_load(ie)) 946 if (evas_cserve2_image_data_load(ie))
947 { 947 {
948 evas_cserve2_image_load_data_wait(ie); 948 error = evas_cserve2_image_load_data_wait(ie);
949
949 RGBA_Image *im = (RGBA_Image *)ie; 950 RGBA_Image *im = (RGBA_Image *)ie;
950 DBG("try cserve2 image data '%s' '%s' loaded!", 951 DBG("try cserve2 image data '%s' '%s' loaded!",
951 ie->file, ie->key ? ie->key : ""); 952 ie->file, ie->key ? ie->key : "");
952 if (im->image.data) 953 if ((error == CSERVE2_NONE) && im->image.data)
953 { 954 {
954 error = EVAS_LOAD_ERROR_NONE; 955 error = EVAS_LOAD_ERROR_NONE;
955 } 956 }