From 16b11e7238dea2c74a713b6f601d5f506bdaadcf Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sat, 10 May 2014 10:22:10 +0100
Subject: ensure operations tables are registered as early as possible.

---
 riscos/gui.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'riscos')

diff --git a/riscos/gui.c b/riscos/gui.c
index 7a505cb5a..ee450fa65 100644
--- a/riscos/gui.c
+++ b/riscos/gui.c
@@ -2483,7 +2483,7 @@ int main(int argc, char** argv)
 	int used = -1;  /* slightly better with older OSLib versions */
 	os_error *error;
 	nserror ret;
-	struct gui_table riscos_gui_table = {
+	struct netsurf_table riscos_table = {
 		.browser = &riscos_browser_table,
 		.window = riscos_window_table,
 		.clipboard = riscos_clipboard_table,
@@ -2494,6 +2494,11 @@ int main(int argc, char** argv)
 		.search = riscos_search_table,
 	};
 
+	ret = netsurf_register(&riscos_table);
+	if (ret != NSERROR_OK) {
+		die("NetSurf operation table failed registration");
+	}
+
 	/* Consult NetSurf$Logging environment variable to decide if logging
 	 * is required. */
 	error = xos_read_var_val_size("NetSurf$Logging", 0, os_VARTYPE_STRING,
@@ -2537,7 +2542,7 @@ int main(int argc, char** argv)
 	}
 
 	/* common initialisation */
-	ret = netsurf_init(path, &riscos_gui_table);
+	ret = netsurf_init(path);
 	if (ret != NSERROR_OK) {
 		die("NetSurf failed to initialise");
 	}
-- 
cgit v1.2.3