derekf pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=f45c0fcd67c8099e8ab527cdf1eb63dcf559f12d

commit f45c0fcd67c8099e8ab527cdf1eb63dcf559f12d
Author: Derek Foreman <[email protected]>
Date:   Fri Jun 30 14:10:50 2017 -0500

    evas image: Set load error on native image set failure
    
    evas_object_image_native_surface_set() has no return, so without
    setting load error we can't tell if it failed.
    
    fix T5418
---
 src/lib/evas/canvas/evas_image_legacy.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/lib/evas/canvas/evas_image_legacy.c 
b/src/lib/evas/canvas/evas_image_legacy.c
index d73d90cc74..a8593db29b 100644
--- a/src/lib/evas/canvas/evas_image_legacy.c
+++ b/src/lib/evas/canvas/evas_image_legacy.c
@@ -483,7 +483,17 @@ EAPI void
 evas_object_image_native_surface_set(Evas_Object *eo_obj, Evas_Native_Surface 
*surf)
 {
    EVAS_IMAGE_API(eo_obj);
-   _evas_image_native_surface_set(eo_obj, surf);
+
+   Eina_Bool ret;
+
+   ret = _evas_image_native_surface_set(eo_obj, surf);
+
+   if (surf && !ret)
+     {
+        Evas_Image_Data *o = efl_data_scope_get(eo_obj, 
EFL_CANVAS_IMAGE_INTERNAL_CLASS);
+
+        o->load_error = EVAS_LOAD_ERROR_GENERIC;
+     }
 }
 
 EAPI Evas_Native_Surface *

-- 


Reply via email to