rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=516276d3cf5cb2f7cac0cdc893bb43826fc0aaef

commit 516276d3cf5cb2f7cac0cdc893bb43826fc0aaef
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date:   Tue Sep 20 11:56:46 2016 +0300

    sound_manager: correct upload of sound after resource manager merge
    
    @fix
---
 src/bin/resource_manager/resource_manager_react.c | 4 ++--
 src/bin/ui/sound_manager.c                        | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/bin/resource_manager/resource_manager_react.c 
b/src/bin/resource_manager/resource_manager_react.c
index 50ddaa7..9e4b60e 100644
--- a/src/bin/resource_manager/resource_manager_react.c
+++ b/src/bin/resource_manager/resource_manager_react.c
@@ -592,13 +592,13 @@ _image_added(void *data,
 
    res = mem_calloc(1, sizeof(Image2));
    res->common.type = RESOURCE2_TYPE_IMAGE;
-   res->common.name = eina_stringshare_add(name);
+   res->common.name = eina_stringshare_add(ecore_file_file_get(name));
    res->comp_type = 
edje_edit_image_compression_type_get(project->global_object,
                                                          res->common.name);
    if (res->comp_type == EDJE_EDIT_IMAGE_COMP_USER)
      res->source = eina_stringshare_add(name);
    else
-     res->source = eina_stringshare_printf("%s/%s", resource_folder, name);
+     res->source = eina_stringshare_printf("%s/%s", resource_folder, 
ecore_file_file_get(name));
 
    project->RM.images = eina_list_append(project->RM.images, res);
    eina_stringshare_del(resource_folder);
diff --git a/src/bin/ui/sound_manager.c b/src/bin/ui/sound_manager.c
index 507c1f8..47b62fa 100644
--- a/src/bin/ui/sound_manager.c
+++ b/src/bin/ui/sound_manager.c
@@ -246,13 +246,13 @@ _add_sample_done(void *data __UNUSED__,
 
    res_path = eina_stringshare_printf("%s/sounds/%s", 
ap.project->develop_path, sound_name);
 
-   if (!ecore_file_exists(res->source))
+   if (!ecore_file_exists(res_path))
      {
-        ecore_file_cp(selected, res->source);
+        ecore_file_cp(selected, res_path);
      }
    else
      {
-        ERR(_("File '%s' exist"), res->source);
+        ERR(_("File '%s' exist"), res_path);
         return true;
      }
 

-- 


Reply via email to