diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-01-20 23:32:34 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-01-20 23:32:34 +0000 |
| commit | 239f999936663c9832bc7569133e694c1ce72741 (patch) | |
| tree | 87dba34352fd8a6f8924ea3bfddd67999c3e44c3 /amiga/gui.c | |
| parent | 1724e2835028daf90de80b151ab8fd4c3064fd02 (diff) | |
| parent | 750677795ba1ca41627edd68a4de24e0d6c07a20 (diff) | |
| download | netsurf-239f999936663c9832bc7569133e694c1ce72741.tar.gz netsurf-239f999936663c9832bc7569133e694c1ce72741.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'amiga/gui.c')
| -rw-r--r-- | amiga/gui.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index 4e68530dd..3dc575cf0 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -562,7 +562,7 @@ static nserror ami_set_options(struct nsoption_s *defaults) nsoption_set_bool(font_antialiasing, false); nsoption_set_bool(truecolour_mouse_pointers, false); nsoption_set_bool(use_openurl_lib, true); - nsoption_set_bool(use_diskfont, true); + nsoption_set_bool(bitmap_fonts, true); #endif if((!nsoption_charp(accept_language)) || @@ -5594,8 +5594,12 @@ int main(int argc, char** argv) #ifdef __amigaos4__ amiga_plugin_hack_init(); -#endif + + /* DataTypes loader needs datatypes.library v45, + * but for some reason that's not in OS3.9. + * Skip it to ensure it isn't causing other problems. */ ret = amiga_datatypes_init(); +#endif /* user options setup */ ret = nsoption_init(ami_set_options, &nsoptions, &nsoptions_default); |