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>

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)
        ie->file, ie->key ? ie->key : "");
    if (evas_cserve2_image_data_load(ie))
      {
-        evas_cserve2_image_load_data_wait(ie);
+        error = evas_cserve2_image_load_data_wait(ie);
+
         RGBA_Image *im = (RGBA_Image *)ie;
         DBG("try cserve2 image data '%s' '%s' loaded!",
             ie->file, ie->key ? ie->key : "");
-        if (im->image.data)
+        if ((error == CSERVE2_NONE) && im->image.data)
           {
              error = EVAS_LOAD_ERROR_NONE;
           }