elementary/menu - backport 70982

SVN revision: 70984

2 files changed, 11 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index febc71c9d..27373592f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,4 +32,10 @@
 	  naviframe.
 
 2012-05-13  Dave Andreoli
+
 	* Fileselector: honor folder_only when using EIO (backport 70965)
+
+2012-05-14  Shinwoo Kim
+
+	* menu: remove crash issue when no-parent item is passed to the
+	  elm_menu_item_separator_add()
diff --git a/src/lib/elm_menu.c b/src/lib/elm_menu.c
index 0cb0da06a..aa8cd81fb 100644
--- a/src/lib/elm_menu.c
+++ b/src/lib/elm_menu.c
@@ -789,7 +789,11 @@ elm_menu_item_separator_add(Evas_Object *obj, Elm_Object_Item *parent)
    /* don't add a separator as the first item */
    if (!wd->items) return NULL;
    /* don't allow adding more than one separator in a row */
-   if (p_item) subitem = eina_list_last(p_item->submenu.items)->data;
+   if (p_item)
+     {
+        if (!p_item->submenu.items) return NULL;
+        subitem = eina_list_last(p_item->submenu.items)->data;
+     }
    else subitem = eina_list_last(wd->items)->data;
    if (subitem->separator) return NULL;