summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Wilson <rjw@netsurf-browser.org>2005-04-14 01:34:23 +0000
committerRichard Wilson <rjw@netsurf-browser.org>2005-04-14 01:34:23 +0000
commit3e82c07a8844bc8569628dd0a2ff79b395555e1b (patch)
treee503e48591bbf1ed410646a573c93983dc62f24f
parentd656bcc592fa02804d40fccd45271e12ba7ed923 (diff)
downloadnetsurf-3e82c07a8844bc8569628dd0a2ff79b395555e1b.tar.gz
netsurf-3e82c07a8844bc8569628dd0a2ff79b395555e1b.tar.bz2
[project @ 2005-04-14 01:34:23 by rjw]
Only close menus we own. svn path=/import/netsurf/; revision=1629
-rw-r--r--riscos/menus.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/riscos/menus.c b/riscos/menus.c
index 01191b03f..f8ab3f34e 100644
--- a/riscos/menus.c
+++ b/riscos/menus.c
@@ -509,6 +509,9 @@ void ro_gui_menu_closed(void) {
struct tree *tree;
os_error *error;
+ if (!current_menu)
+ return;
+
error = xwimp_create_menu(wimp_CLOSE_MENU, 0, 0);
if (error) {
LOG(("xwimp_create_menu: 0x%x: %s",
@@ -516,9 +519,6 @@ void ro_gui_menu_closed(void) {
warn_user("MenuError", error->errmess);
}
- if (!current_menu)
- return;
-
ro_gui_menu_get_window_details(current_menu_window, &g, &bw, &c, &t, &tree);
current_menu = NULL;