summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2015-04-10 16:18:54 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2015-04-10 16:54:34 +0900
commit76bb86f42cd70ce2a9659667a5c0f5365a13cc3f (patch)
treee168278702497c8cead98319846f7306ffcffcf6
parent7258e0d4683d7a2dd1a937a5a2e3c5f40008779f (diff)
downloadefl-76bb86f42cd70ce2a9659667a5c0f5365a13cc3f.tar.gz
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
-rw-r--r--src/lib/evas/canvas/evas_object_image.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c
index 9ec344a15d..12c4a11b64 100644
--- a/src/lib/evas/canvas/evas_object_image.c
+++ b/src/lib/evas/canvas/evas_object_image.c
@@ -598,7 +598,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;
}