From 0a19a87c0eedfc2bb3040d776a3c5cb445c9291c Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Fri, 10 Apr 2015 16:18:54 +0900 Subject: [PATCH] Evas image: Return proper path even with mmap Since we're using a union (u.{f,file} we can't just return u.file when the file was set as an mmap source. @fix --- src/lib/evas/canvas/evas_object_image.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index ebd3292c99..36e0a800bc 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -607,7 +607,13 @@ _evas_image_efl_file_file_set(Eo *eo_obj, Evas_Image_Data *o, const char *file, EOLIAN static void _evas_image_efl_file_file_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o, const char **file, const char **key) { - if (file) *file = o->cur->u.file; + if (file) + { + if (o->cur->mmaped_source) + *file = eina_file_filename_get(o->cur->u.f); + else + *file = o->cur->u.file; + } if (key) *key = o->cur->key; }