From 743637a8d2105df6ffc464a3cb4753cdc8c1401f Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Thu, 29 Dec 2016 11:45:21 +0000 Subject: 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. --- frontends/riscos/hotlist.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'frontends/riscos') 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); + } } -- cgit v1.2.3