fix annoying but harmless safety check error with toolbar menus
authordiscomfitor <discomfitor@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Mon, 25 Jul 2011 04:05:58 +0000 (04:05 +0000)
committerMike McCormack <mj.mccormack@samsung.com>
Mon, 14 Nov 2011 04:11:11 +0000 (13:11 +0900)
git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@61663 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

src/lib/elm_menu.c

index 0f907ba..d81716b 100644 (file)
@@ -418,7 +418,7 @@ _item_submenu_obj_create(Elm_Menu_Item *item)
    edje_object_mirrored_set(VIEW(item), elm_widget_mirrored_get(WIDGET(item)));
    _elm_theme_object_set(WIDGET(item), VIEW(item), "menu", "item_with_submenu",  elm_widget_style_get(WIDGET(item)));
    elm_menu_item_label_set(item, item->label);
-   elm_menu_item_icon_set(item, item->icon_str);
+   if (item->icon_str) elm_menu_item_icon_set(item, item->icon_str);
 
    edje_object_signal_callback_add(VIEW(item), "elm,action,open", "",
                                    _submenu_open, item);