mirror of
https://github.com/netsurf-browser/netsurf
synced 2024-11-28 09:13:08 +03:00
Safer menu deletions; stop menus from appending to existing menu with each new window.
svn path=/trunk/netsurf/; revision=5578
This commit is contained in:
parent
1d8bbfae4c
commit
a6b42a06ff
@ -187,7 +187,9 @@ void ami_menu_scan(struct tree *tree,struct NewMenu *menu)
|
|||||||
struct node_element *element=NULL;
|
struct node_element *element=NULL;
|
||||||
struct node *node;
|
struct node *node;
|
||||||
static WORD gen = 0;
|
static WORD gen = 0;
|
||||||
static ULONG item = AMI_MENU_HOTLIST;
|
static ULONG item;
|
||||||
|
|
||||||
|
item = AMI_MENU_HOTLIST;
|
||||||
|
|
||||||
for (node = root; node; node = node->next)
|
for (node = root; node; node = node->next)
|
||||||
{
|
{
|
||||||
@ -220,7 +222,8 @@ void ami_menu_scan_2(struct tree *tree,struct node *root,WORD *gen,ULONG *item,s
|
|||||||
if(*gen == 2) menu[*item].nm_Type = NM_ITEM;
|
if(*gen == 2) menu[*item].nm_Type = NM_ITEM;
|
||||||
if(*gen == 3) menu[*item].nm_Type = NM_SUB;
|
if(*gen == 3) menu[*item].nm_Type = NM_SUB;
|
||||||
|
|
||||||
menu[*item].nm_Label = element->text;
|
menulab[*item] = ami_utf8_easy(element->text);
|
||||||
|
menu[*item].nm_Label = menulab[*item];
|
||||||
|
|
||||||
element = tree_find_element(node, TREE_ELEMENT_URL);
|
element = tree_find_element(node, TREE_ELEMENT_URL);
|
||||||
if(element && element->text)
|
if(element && element->text)
|
||||||
|
Loading…
Reference in New Issue
Block a user