From ea6f3f8812ae2786bb53ec71b645cb87899b199e Mon Sep 17 00:00:00 2001 From: Adrian Lees Date: Thu, 9 Jun 2005 18:37:27 +0000 Subject: [project @ 2005-06-09 18:37:27 by adrianl] Prevent checksum code traversing submenu dialogues svn path=/import/netsurf/; revision=1747 --- riscos/menus.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/riscos/menus.c b/riscos/menus.c index 42f2d6f01..b895395c9 100644 --- a/riscos/menus.c +++ b/riscos/menus.c @@ -2026,7 +2026,7 @@ int ro_gui_menu_get_checksum(void) { } menu = current_menu; - do { + while (menu_tree.items[i] != -1) { j = 0; do { if (menu->entries[j].icon_flags & wimp_ICON_SHADED) @@ -2034,12 +2034,12 @@ int ro_gui_menu_get_checksum(void) { if (menu->entries[j].menu_flags & wimp_MENU_TICKED) checksum ^= (2 << (i + j * 2)); } while (!(menu->entries[j++].menu_flags & wimp_MENU_LAST)); + j = menu_tree.items[i++]; - if (j != -1) { - menu = menu->entries[j].sub_menu; - if ((!menu) || (menu == wimp_NO_SUB_MENU)) - break; - } - } while (j != -1); + menu = menu->entries[j].sub_menu; + if ((!menu) || (menu == wimp_NO_SUB_MENU)) + break; + } + return checksum; } -- cgit v1.2.3