rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=9fb194659247a444ff0fb62cbe21bf5293e04350
commit 9fb194659247a444ff0fb62cbe21bf5293e04350
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date: Fri Sep 23 13:59:21 2016 +0300
editor_top_level: do not CRIT when image is already exist, just return false
For example, on reopening new project or importing, it fails now because
dummy image is exists already so we dont need to add it.
@fix
---
src/bin/editor/editor_top_level.c | 3 ++-
src/bin/project_manager/project_manager2.c | 5 ++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/bin/editor/editor_top_level.c
b/src/bin/editor/editor_top_level.c
index c493e4b..c8dbc86 100644
--- a/src/bin/editor/editor_top_level.c
+++ b/src/bin/editor/editor_top_level.c
@@ -31,7 +31,8 @@ editor_image_add(Evas_Object *obj, const char *name,
Eina_Bool notify)
assert(obj != NULL);
assert(name != NULL);
- CRIT_ON_FAIL(edje_edit_image_add(obj, name));
+ if (edje_edit_image_add(obj, name))
+ return false;
if (!editor_save(obj))
return false; /* i hope it will never happen */
diff --git a/src/bin/project_manager/project_manager2.c
b/src/bin/project_manager/project_manager2.c
index 691889b..3d736cd 100644
--- a/src/bin/project_manager/project_manager2.c
+++ b/src/bin/project_manager/project_manager2.c
@@ -281,7 +281,10 @@ _project_dummy_image_add(Project *project)
snprintf(buf, sizeof(buf), "%s"EFLETE_DUMMY_IMAGE_NAME, ap.path.image_path);
you_shall_not_pass_editor_signals(NULL);
- CRIT_ON_FAIL(editor_image_add(obj, buf, false));
+ if (editor_image_add(obj, buf, false))
+ {
+ CRIT_ON_FAIL(editor_save(obj));
+ }
you_shall_pass_editor_signals(NULL);
ecore_evas_free(ecore_evas);
--
