netsurf: branch master updated. release/3.0-143-g2dec72b

NetSurf Browser Project (Commit Mailer) no-reply at netsurf-browser.org
Tue May 28 20:13:41 BST 2013


Gitweb links:

...log http://git.netsurf-browser.org/netsurf.git/shortlog/2dec72b4d55b3e728a8582d7055584ecabfb8010
...commit http://git.netsurf-browser.org/netsurf.git/commit/2dec72b4d55b3e728a8582d7055584ecabfb8010
...tree http://git.netsurf-browser.org/netsurf.git/tree/2dec72b4d55b3e728a8582d7055584ecabfb8010

The branch, master has been updated
       via  2dec72b4d55b3e728a8582d7055584ecabfb8010 (commit)
      from  45d309c0e3020afd785e4342cde7893b4afccd2a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=2dec72b4d55b3e728a8582d7055584ecabfb8010
commit 2dec72b4d55b3e728a8582d7055584ecabfb8010
Author: Chris Young <chris at unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris at unsatisfactorysoftware.co.uk>

    Re-order Messages loading to avoid a crash on launch

diff --git a/amiga/gui.c b/amiga/gui.c
index 6ebde9b..b55992a 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");


-----------------------------------------------------------------------

Summary of changes:
 amiga/gui.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/amiga/gui.c b/amiga/gui.c
index 6ebde9b..b55992a 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");


-- 
NetSurf Browser



More information about the netsurf-commits mailing list