diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-05-28 20:12:47 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-05-28 20:13:34 +0100 |
| commit | 2dec72b4d55b3e728a8582d7055584ecabfb8010 (patch) | |
| tree | d62afa5426c44d04c5d1d333f8eaea494ef45ab5 | |
| parent | 45d309c0e3020afd785e4342cde7893b4afccd2a (diff) | |
| download | netsurf-2dec72b4d55b3e728a8582d7055584ecabfb8010.tar.gz netsurf-2dec72b4d55b3e728a8582d7055584ecabfb8010.tar.bz2 | |
Re-order Messages loading to avoid a crash on launch
| -rw-r--r-- | amiga/gui.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index 6ebde9bfe..b55992a50 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -311,9 +311,6 @@ bool ami_locate_resource(char *fullpath, const char *file) found = ami_gui_check_resource(fullpath, file); if(found) return true; - /* Secondly check the user's selected theme. NB: ami_locate_resource() - * gets called for Messages before options are loaded */ - if(nsoption_charp(theme)) { strcpy(fullpath, nsoption_charp(theme)); @@ -993,9 +990,6 @@ int main(int argc, char** argv) current_user_options = ASPrintf("%s/Choices", current_user_dir); - if(ami_locate_resource(messages, "Messages") == false) - die("Cannot open Messages file"); - ami_mime_init("PROGDIR:Resources/mimetypes"); sprintf(temp, "%s/mimetypes.user", current_user_dir); ami_mime_init(temp); @@ -1018,6 +1012,9 @@ int main(int argc, char** argv) nsoption_read(current_user_options, NULL); nsoption_commandline(&argc, argv, NULL); + if(ami_locate_resource(messages, "Messages") == false) + die("Cannot open Messages file"); + ret = netsurf_init(messages); if (ret != NSERROR_OK) { die("NetSurf failed to initialise"); |