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

Avoid some crashing by disabling the update of the hotlist menu

Browse Source 
This will be fixed properly when the menu code is re-written to use menuclass, as that supports dynamic updates.
This commit is contained in:
Chris Young 2016-02-29 18:10:45 +00:00
parent 618e4570ef
commit 64575f2aed
4 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
amiga/font_diskfont.c
View File

@ -103,6 +103,7 @@ static size_t ami_font_bm_convert_local_to_utf8_offset(const char *utf8string, s
for(UWORD i = 0; i < offset; i++) {
chr = utf8_next(utf8string, length, chr);
if(chr > length) return length;
}
return chr;

2
amiga/gui.c
View File

@ -3739,7 +3739,7 @@ HOOKF(void, ami_scroller_hook, Object *, object, struct IntuiMessage *)
break;
default:
LOG("IDCMP hook unhandled event: %d\n", msg->Class);
LOG("IDCMP hook unhandled event: %ld\n", msg->Class);
break;
}
// ReplyMsg((struct Message *)msg);

26
amiga/menu.c
View File

@ -43,6 +43,7 @@
#include "utils/nsoption.h"
#include "utils/messages.h"
#include "utils/log.h"
#include "desktop/hotlist.h"
#include "desktop/browser.h"
@ -516,7 +517,7 @@ void ami_free_menulabs(struct gui_window_2 *gwin)
{
int i;
for(i=0;i<=AMI_MENU_AREXX_MAX;i++) {
for(i=0;i<AMI_MENU_AREXX_MAX;i++) {
if(gwin->menulab[i] && (gwin->menulab[i] != NM_BARLABEL)) {
if(gwin->menutype[i] & MENU_IMAGE) {
if(gwin->menuobj[i]) DisposeObject(gwin->menuobj[i]);
@ -526,6 +527,7 @@ void ami_free_menulabs(struct gui_window_2 *gwin)
if(i >= AMI_MENU_AREXX) {
if(gwin->menu_hook[i].h_Data) free(gwin->menu_hook[i].h_Data);
gwin->menu_hook[i].h_Data = NULL;
}
}
@ -535,10 +537,7 @@ void ami_free_menulabs(struct gui_window_2 *gwin)
}
FreeVec(gwin->menutype);
FreeVec(gwin->menu);
gwin->menutype = NULL;
gwin->menu = NULL;
}
static void ami_menu_alloc_item(struct gui_window_2 *gwin, int num, UBYTE type,
@ -555,7 +554,7 @@ static void ami_menu_alloc_item(struct gui_window_2 *gwin, int num, UBYTE type,
utf8_from_local_encoding(label,
(strlen(label) < NSA_MAX_HOTLIST_MENU_LEN) ? strlen(label) : NSA_MAX_HOTLIST_MENU_LEN,
&gwin->menulab[num]);
} else if((num >= AMI_MENU_AREXX) && (num <= AMI_MENU_AREXX_MAX)) {
} else if((num >= AMI_MENU_AREXX) && (num < AMI_MENU_AREXX_MAX)) {
gwin->menulab[num] = strdup(label);
} else {
gwin->menulab[num] = ami_utf8_easy(messages_get(label));
@ -585,13 +584,14 @@ static void ami_init_menulabs(struct gui_window_2 *gwin)
{
int i;
gwin->menutype = ami_misc_allocvec_clear(AMI_MENU_AREXX_MAX + 1, 0);
gwin->menutype = ami_misc_allocvec_clear(sizeof(UBYTE) * (AMI_MENU_AREXX_MAX + 1), 0);
for(i=0;i <= AMI_MENU_AREXX_MAX;i++)
{
gwin->menutype[i] = NM_IGNORE;
gwin->menulab[i] = NULL;
gwin->menuobj[i] = NULL;
gwin->menuicon[i] = NULL;
}
ami_menu_alloc_item(gwin, M_PROJECT, NM_TITLE, "Project", 0, NULL, NULL, NULL);
@ -704,17 +704,25 @@ static void ami_init_menulabs(struct gui_window_2 *gwin)
/* Menu refresh for hotlist */
void ami_menu_refresh(struct gui_window_2 *gwin)
{
return; /**\todo fix this after migrating to menuclass */
struct Menu *menu;
LOG("Clearing MenuStrip");
SetAttrs(gwin->objects[OID_MAIN],
WINDOW_MenuStrip, NULL,
TAG_DONE);
LOG("Freeing menu");
ami_menu_free(gwin);
LOG("Freeing menu labels");
ami_free_menulabs(gwin);
LOG("Creating new menu");
menu = ami_menu_create(gwin);
LOG("Attaching MenuStrip %p to %p", menu, gwin->objects[OID_MAIN]);
SetAttrs(gwin->objects[OID_MAIN],
WINDOW_MenuStrip, menu,
TAG_DONE);
@ -801,7 +809,7 @@ static struct gui_window_2 *ami_menu_layout(struct gui_window_2 *gwin)
if(menu_glyphs_loaded == false)
ami_menu_load_glyphs(dri);
for(i=0; i <= AMI_MENU_AREXX_MAX; i++)
for(i=0; i < AMI_MENU_AREXX_MAX; i++)
{
if(gwin->menutype[i] == NM_TITLE) {
j = i + 1;
@ -926,8 +934,8 @@ struct Menu *ami_menu_create(struct gui_window_2 *gwin)
gwin->imenu = CreateMenus(gwin->menu, TAG_DONE);
LayoutMenus(gwin->imenu, gwin->vi,
GTMN_NewLookMenus, TRUE, TAG_DONE);
/**\todo do we even need to store/keep gwin->menu? **/
FreeVec(gwin->menu); /**\todo this should be local to this function */
gwin->menu = NULL;
return gwin->imenu;
}

2
amiga/tree.c
View File

@ -672,12 +672,14 @@ static void ami_tree_menu(struct treeview_window *twin)
twin->menu[24].nm_Label = twin->menu_name[24];
twin->menu[25].nm_Type = NM_END;
twin->menu_name[25] = NULL;
}
}
static void ami_tree_update_buttons(struct treeview_window *twin)
{
if(twin->type == AMI_TREE_SSLCERT) return;
if(twin->menu == NULL) return;
if(twin->type != AMI_TREE_HOTLIST) {
OffMenu(twin->win, AMI_TREE_MENU_NEWDIR);