diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2010-03-21 19:29:33 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2010-03-21 19:29:33 +0000 |
| commit | 48aa33f77382e5cc202e710e1db45126171e12e8 (patch) | |
| tree | ec6221c1301a6f5ae9f653034cbc38e90ebf6a47 /amiga | |
| parent | dd5370ef830ff2b813473cfde3c7296e11c7cde0 (diff) | |
| download | netsurf-48aa33f77382e5cc202e710e1db45126171e12e8.tar.gz netsurf-48aa33f77382e5cc202e710e1db45126171e12e8.tar.bz2 | |
Fix crash when attempting to open context menu in a browser_window with no content.
svn path=/trunk/netsurf/; revision=10143
Diffstat (limited to 'amiga')
| -rwxr-xr-x | amiga/context_menu.c | 5 |
1 files changed, 4 insertions, 1 deletions
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; |