summaryrefslogtreecommitdiff
path: root/frontends/riscos
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2016-12-29 12:21:03 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2016-12-29 12:21:03 +0000
commit7b7b1507d01b3e078790150d6b5f59ebaf0b45c3 (patch)
treeef5a4bd1150e62ac1848e15d6665773f911c508a /frontends/riscos
parent2917af0a967bda993b8c1c5f194eea0b9881b6be (diff)
downloadnetsurf-7b7b1507d01b3e078790150d6b5f59ebaf0b45c3.tar.gz
netsurf-7b7b1507d01b3e078790150d6b5f59ebaf0b45c3.tar.bz2
Revert "RISC OS: Ensure core's hotlist_init is called on startup."
This reverts commit 743637a8d2105df6ffc464a3cb4753cdc8c1401f.
Diffstat (limited to 'frontends/riscos')
-rw-r--r--frontends/riscos/hotlist.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/frontends/riscos/hotlist.c b/frontends/riscos/hotlist.c
index ae27bf55d..15c5f5488 100644
--- a/frontends/riscos/hotlist.c
+++ b/frontends/riscos/hotlist.c
@@ -552,25 +552,24 @@ nserror ro_gui_hotlist_present(void)
error->errmess);
}
- LOG("Presenting hotlist");
- ro_gui_dialog_open_top(hotlist_window->core.wh,
- hotlist_window->core.toolbar,
- 600, 800);
+ 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);
+ }
- return NSERROR_OK;
+ return res;
}
/* 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);
- }
}