From 395970c40c22d4d6e321ff7be98be39692add121 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Sun, 17 Oct 2010 04:48:39 +0000
Subject: [PATCH] update failure order

SVN revision: 53505
---
 legacy/eeze/src/lib/eeze_main.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/legacy/eeze/src/lib/eeze_main.c b/legacy/eeze/src/lib/eeze_main.c
index 2739c88b7c..b70cfbd29c 100644
--- a/legacy/eeze/src/lib/eeze_main.c
+++ b/legacy/eeze/src/lib/eeze_main.c
@@ -42,8 +42,8 @@ eeze_init(void)
    if (++_eeze_init_count != 1)
      return _eeze_init_count;
 
-   if (!eina_init() || !ecore_init())
-     return --_eeze_init_count;
+   if (!eina_init())
+     return 0;
 
    _eeze_udev_log_dom = eina_log_domain_register
                        ("eeze_udev", EEZE_UDEV_COLOR_DEFAULT);
@@ -51,21 +51,27 @@ eeze_init(void)
    if (_eeze_udev_log_dom < 0)
      {
         EINA_LOG_ERR("Could not register 'eeze_udev' log domain.");
-        goto fail;
+        goto eina_fail;
      }
 
+   if (!ecore_init())
+     goto fail;
+
    if (!((udev) = udev_new()))
      {
         EINA_LOG_ERR("Could not initialize udev library!");
-        goto fail;
+        goto ecore_fail;
      }
 
    return _eeze_init_count;
+ecore_fail:
+   ecore_shutdown();
 fail:
    eina_log_domain_unregister(_eeze_udev_log_dom);
    _eeze_udev_log_dom = -1;
+eina_fail:
    eina_shutdown();
-   return _eeze_init_count;
+   return 0;
 }
 
 /**