From 0090618c178c8e57983fc347ef940e63738586d7 Mon Sep 17 00:00:00 2001 From: Murali Ganapathy Date: Sun, 22 Jun 2008 23:04:11 -0700 Subject: complex menu: Fixed bug in menu.c so complex.c32 works again. Avoid crashing in the presence of unnamed submenus. --- menu/libmenu/menu.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'menu') diff --git a/menu/libmenu/menu.c b/menu/libmenu/menu.c index 841e59ca..56a7426c 100644 --- a/menu/libmenu/menu.c +++ b/menu/libmenu/menu.c @@ -695,10 +695,11 @@ void fix_submenus() for (j=0; j < m->numitems; j++) { mi = m->items[j]; - // if submenu with non-trivial data string - // again using hack that itemdata is a union data type - if ( mi->data && ((mi->action == OPT_SUBMENU) || (mi->action == OPT_RADIOMENU)) ) + // if item is a submenu and has non-empty non-trivial data string + if (mi->data && strlen(mi->data) > 0 && + ((mi->action == OPT_SUBMENU) || (mi->action == OPT_RADIOMENU)) ) { mi->itemdata.submenunum = find_menu_num (mi->data); + } } } } -- cgit v1.2.3