mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-11-04 13:30:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/menu: Handle menu item creation failure

Browse source
This commit is contained in:
Consolatis 2022-06-12 21:14:48 +02:00 • committed by Johan Malm
parent 505f92e733
commit 2aaf26e87b
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/menu/menu.c
View file

@ -268,7 +268,11 @@ handle_menu_element(xmlNode *n, struct server *server)
* create an item pointing to the new submenu * create an item pointing to the new submenu
*/ */
current_item = item_create(current_menu, label); current_item = item_create(current_menu, label);
submenu = &current_item->submenu; if (current_item) {
submenu = &current_item->submenu;
} else {
submenu = NULL;
}
} }
++menu_level; ++menu_level;
current_menu = menu_create(server, id, label); current_menu = menu_create(server, id, label);
@ -282,7 +286,9 @@ handle_menu_element(xmlNode *n, struct server *server)
struct menu *menu = menu_get_by_id(id); struct menu *menu = menu_get_by_id(id);
if (menu) { if (menu) {
current_item = item_create(current_menu, menu->label); current_item = item_create(current_menu, menu->label);
current_item->submenu = menu; if (current_item) {
current_item->submenu = menu;
}
} else { } else {
wlr_log(WLR_ERROR, "no menu with id '%s'", id); wlr_log(WLR_ERROR, "no menu with id '%s'", id);
} }