summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2016-12-29 11:45:21 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2016-12-29 11:45:21 +0000
commit743637a8d2105df6ffc464a3cb4753cdc8c1401f (patch)
tree0ab17e1de98b492800b376012fe12844116266aa
parent49b1b0b3a51092d7612e496ae6bc8d7d8651425b (diff)
downloadnetsurf-743637a8d2105df6ffc464a3cb4753cdc8c1401f.tar.gz
netsurf-743637a8d2105df6ffc464a3cb4753cdc8c1401f.tar.bz2
RISC OS: Ensure core's hotlist_init is called on startup.
Until the core hotlist_init is called, it is impossible to add pages to the hotlist. This means we need to ensure it is called on startup, rather than when first showing the hotlist.
-rw-r--r--frontends/riscos/hotlist.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c
index 24ced69b5..80dd7d36d 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -554,24 +554,25 @@ nserror ro_gui_hotlist_present(void)
error->errmess);
}
- res = ro_hotlist_init();
- if (res == NSERROR_OK) {
- LOG("Presenting");
- ro_gui_dialog_open_top(hotlist_window->core.wh,
- hotlist_window->core.toolbar,
- 600, 800);
- } else {
- LOG("Failed presenting code %d", res);
- }
+ LOG("Presenting hotlist");
+ ro_gui_dialog_open_top(hotlist_window->core.wh,
+ hotlist_window->core.toolbar,
+ 600, 800);
- return res;
+ return NSERROR_OK;
}
/* exported interface documented in riscos/hotlist.h */
void ro_gui_hotlist_initialise(void)
{
+ nserror res;
dialog_hotlist_template = ro_gui_dialog_load_template("tree");
+
+ res = ro_hotlist_init();
+ if (res != NSERROR_OK) {
+ LOG("Failed initialising hotlist %d", res);
+ }
}