summaryrefslogtreecommitdiff
path: root/amiga/gui.c
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2012-10-17 14:20:18 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2012-10-17 14:20:18 +0100
commit35eb251244ee360cedef6ec1143e65b59da604a8 (patch)
treeb1f508161b6d7502abd534d786650ca7507373a5 /amiga/gui.c
parent26ac642ef9f6bb439f10a7fc3188823ba1f7bffd (diff)
downloadnetsurf-35eb251244ee360cedef6ec1143e65b59da604a8.tar.gz
netsurf-35eb251244ee360cedef6ec1143e65b59da604a8.tar.bz2
Fix "error setting certificate verify locations" problem when the Choices file doesn't exist. Now there's a single place for front ends to set options overrides. Fix nsoption_setnull_charp leak.
Diffstat (limited to 'amiga/gui.c')
-rwxr-xr-xamiga/gui.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index 01f149c31..ab94e8ca0 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -540,6 +540,13 @@ nsurl *gui_get_resource_url(const char *path)
return url;
}
+/* Documented in desktop/options.h */
+void gui_options_init_defaults(void)
+{
+ /* Set defaults for absent option strings */
+ ami_set_options(); /* check options and set defaults where required */
+}
+
void gui_init(int argc, char** argv)
{
BPTR lock = 0;
@@ -549,8 +556,6 @@ void gui_init(int argc, char** argv)
ami_clipboard_init();
ami_openurl_open();
- ami_set_options(); /* check options and set defaults where required */
-
win_destroyed = false;
nsscreentitle = ASPrintf("NetSurf %s",netsurf_version);