diff --git a/src/bin/edje/edje_external_inspector.c b/src/bin/edje/edje_external_inspector.c --- a/src/bin/edje/edje_external_inspector.c +++ b/src/bin/edje/edje_external_inspector.c @@ -614,9 +614,12 @@ ecore_app_no_system_modules(); - ecore_init(); - eina_init(); - edje_init(); + if (!eina_init()) + { + fprintf(stderr, "Eina init failed\n"); + ret = 1; + goto error_eina; + } _log_dom = eina_log_domain_register ("edje_external_inspector", EINA_COLOR_YELLOW); @@ -628,6 +631,13 @@ goto error_log; } + if (!ecore_init()) + { + ERR("Ecore init failed"); + ret = 1; + goto error_ecore; + } + arg_index = ecore_getopt_parse(&optdesc, values, argc, argv); if (arg_index < 0) { @@ -638,6 +648,13 @@ else if (quit_option) goto error_getopt; + if (!edje_init()) + { + ERR("Edje init failed"); + ret = 1; + goto error_getopt; + } + if (!mode) mode = (char *)mode_choices[0]; if (detail_name) @@ -669,12 +686,14 @@ free(module_patterns_str); + edje_shutdown(); error_getopt: + ecore_shutdown(); +error_ecore: eina_log_domain_unregister(_log_dom); error_log: - edje_shutdown(); - ecore_shutdown(); eina_shutdown(); +error_eina: return ret; }