summaryrefslogtreecommitdiff
path: root/riscos/menus.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2010-04-07 15:34:01 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2010-04-07 15:34:01 +0000
commit4119cc50b47c02816a96828f915a2887c3dde72e (patch)
tree2e63d0e240560d594e3d17c133f09901f125e843 /riscos/menus.c
parentc147001a17240b1034f91f634a590dce3ae4564c (diff)
downloadnetsurf-4119cc50b47c02816a96828f915a2887c3dde72e.tar.gz
netsurf-4119cc50b47c02816a96828f915a2887c3dde72e.tar.bz2
More new cache fixing.
svn path=/trunk/netsurf/; revision=10274
Diffstat (limited to 'riscos/menus.c')
-rw-r--r--riscos/menus.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/riscos/menus.c b/riscos/menus.c
index 70c4c8d74..0d9f35a29 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -498,29 +498,34 @@ void ro_gui_menu_create(wimp_menu *menu, int x, int y, wimp_w w)
/* read the object under the pointer for a new gui_window menu */
if ((!current_menu) && (menu == browser_menu)) {
- hlcache_handle *c = g->bw->current_content;
+ hlcache_handle *h;
g = ro_gui_window_lookup(w);
+ h = g->bw->current_content;
if (!ro_gui_window_to_window_pos(g, x, y, &pos))
return;
current_menu_object = NULL;
current_menu_url = NULL;
- if (c) {
- switch (content_get_type(c)) {
+ if (h) {
+ switch (content_get_type(h)) {
case CONTENT_HTML: {
struct box *box;
- box = box_object_at_point(c, pos.x, pos.y);
- current_menu_object = box ? box->object : NULL;
- box = box_href_at_point(c, pos.x, pos.y);
- current_menu_url = box ? box->href : NULL;
+ box = box_object_at_point(h, pos.x,
+ pos.y);
+ current_menu_object = box ?
+ box->object : NULL;
+ box = box_href_at_point(h, pos.x,
+ pos.y);
+ current_menu_url = box ?
+ box->href : NULL;
}
break;
case CONTENT_TEXTPLAIN:
/* no object, no url */
break;
default:
- current_menu_object = c;
+ current_menu_object = h;
break;
}
}
@@ -1584,7 +1589,7 @@ bool ro_gui_menu_handle_action(wimp_w owner, menu_action action,
case BROWSER_OBJECT_RELOAD:
if (!current_menu_object)
return false;
- current_menu_object->fresh = false;
+ content_invalidate_reuse_data(current_menu_object);
browser_window_reload(bw, false);
return true;