From 69821ee547534ba275c5d0c1d1fbd0c50f29a17e Mon Sep 17 00:00:00 2001
From: Gustavo Sverzut Barbieri <barbieri@gmail.com>
Date: Sat, 18 Apr 2009 23:45:26 +0000
Subject: [PATCH] proper cleanup on icon/edje failure.

SVN revision: 40201
---
 src/bin/e_menu.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 3bc486909..f3a43366f 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -1237,7 +1237,10 @@ _e_menu_item_realize(E_Menu_Item *mi)
 		  evas_object_show(o);
 	       }
 	     else
-	       evas_object_del(o);
+	       {
+		  evas_object_del(o);
+		  o = NULL;
+	       }
 	     
              /* FIXME: Not sure why there are two different tries to get the icon size, surely only the last one si needed. */
              /* FIXME: Do it this way later, when e_app_icon_add() just registers a request for an icon to be filled in when it's ready.
@@ -1264,6 +1267,11 @@ _e_menu_item_realize(E_Menu_Item *mi)
 			    icon_w = iww;
 			    icon_h = ihh;
 			 }
+		       else
+			 {
+			    evas_object_del(o);
+			    o = NULL;
+			 }
 		    }
 		  if (!mi->icon_object)
 		    {