diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2008-10-15 21:40:54 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2008-10-15 21:40:54 +0000 |
| commit | a6b42a06fff08bd4997d19f9cde40e4554a3692d (patch) | |
| tree | 0aa71e797c2ae1bf5e60e00f2fff27020e9a4192 | |
| parent | 1d8bbfae4cde28e9102ee0ed020ac28f499c1d59 (diff) | |
| download | netsurf-a6b42a06fff08bd4997d19f9cde40e4554a3692d.tar.gz netsurf-a6b42a06fff08bd4997d19f9cde40e4554a3692d.tar.bz2 | |
Safer menu deletions; stop menus from appending to existing menu with each new window.
svn path=/trunk/netsurf/; revision=5578
| -rwxr-xr-x | amiga/menu.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/amiga/menu.c b/amiga/menu.c index 3eb8c019c..8d87e77b0 100755 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -187,7 +187,9 @@ void ami_menu_scan(struct tree *tree,struct NewMenu *menu) struct node_element *element=NULL; struct node *node; static WORD gen = 0; - static ULONG item = AMI_MENU_HOTLIST; + static ULONG item; + + item = AMI_MENU_HOTLIST; 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 == 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); if(element && element->text) |