From 48aa33f77382e5cc202e710e1db45126171e12e8 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Sun, 21 Mar 2010 19:29:33 +0000 Subject: Fix crash when attempting to open context menu in a browser_window with no content. svn path=/trunk/netsurf/; revision=10143 --- amiga/context_menu.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/amiga/context_menu.c b/amiga/context_menu.c index 24dd90f2b..ab0d9a446 100755 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -73,12 +73,13 @@ void ami_context_menu_free(void) void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) { - struct box *curbox = gwin->bw->current_content->data.html.layout; struct content *cc = gwin->bw->current_content; + struct box *curbox; int box_x=0; int box_y=0; bool menuhascontent = false; + if(!cc) return; if(cc->type != CONTENT_HTML) return; if(gwin->objects[OID_MENU]) DisposeObject(gwin->objects[OID_MENU]); @@ -90,6 +91,8 @@ void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) PMA_MenuHandler, &gwin->popuphook, TAG_DONE); + curbox = gwin->bw->current_content->data.html.layout; + while(curbox = box_at_point(curbox,x,y,&box_x,&box_y,&cc)) { if (curbox->style && css_computed_visibility(curbox->style) == CSS_VISIBILITY_HIDDEN) continue; -- cgit v1.2.3