mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-28 01:09:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue with hotlist items outside the menu folder being added to the menu

Browse Source 
in some circumstances.

svn path=/trunk/netsurf/; revision=5791
This commit is contained in:
Chris Young 2008-11-25 22:43:23 +00:00
parent ae0b5ff460
commit 7c65316f44
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
amiga/menu.c
View File

@ -304,7 +304,7 @@ void ami_menu_scan(struct tree *tree,struct NewMenu *menu)
if(element && (strcmp(element->text,"Menu")==0))
{
// found menu
ami_menu_scan_2(tree,node,&gen,&item,menu);
ami_menu_scan_2(tree,node->child,&gen,&item,menu);
}
}
}
@ -321,12 +321,12 @@ void ami_menu_scan_2(struct tree *tree,struct node *root,WORD *gen,ULONG *item,s
{
element = tree_find_element(node, TREE_ELEMENT_TITLE);
if((*gen > 1) && (*gen < 4))
if((*gen > 0) && (*gen < 3))
{
if(*item >= AMI_MENU_HOTLIST_MAX) return;
if(*gen == 2) menu[*item].nm_Type = NM_ITEM;
if(*gen == 3) menu[*item].nm_Type = NM_SUB;
if(*gen == 1) menu[*item].nm_Type = NM_ITEM;
if(*gen == 2) menu[*item].nm_Type = NM_SUB;
if(strcmp(element->text,"--"))
{
@ -341,7 +341,6 @@ void ami_menu_scan_2(struct tree *tree,struct node *root,WORD *gen,ULONG *item,s
element = tree_find_element(node, TREE_ELEMENT_URL);
if(element && element->text) menu[*item].nm_UserData = (void *)element->text;
if(node->folder && (!node->child)) menu[*item].nm_Flags = NM_ITEMDISABLED;
*item = *item + 1;