Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/13a7004e6b152494eeab677774cdb626b9e1541d
...commit
http://git.netsurf-browser.org/netsurf.git/commit/13a7004e6b152494eeab677774cdb626b9e1541d
...tree
http://git.netsurf-browser.org/netsurf.git/tree/13a7004e6b152494eeab677774cdb626b9e1541d
The branch, master has been updated
via 13a7004e6b152494eeab677774cdb626b9e1541d (commit)
from 61891ada50f1407778292cf104c595192f73b17c (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=13a7004e6b152494eeab677774cdb626b9e1541d
commit 13a7004e6b152494eeab677774cdb626b9e1541d
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Fix URL + FORCE issue #2635
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index e08ef59..43dd351 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1037,6 +1037,10 @@ static void gui_init2(int argc, char** argv)
(nsoption_bool(startup_no_window) == false))
ami_openscreenfirst();
+ if(cli_force == true) {
+ notalreadyrunning = TRUE;
+ }
+
if(temp_homepage_url && notalreadyrunning) {
error = nsurl_create(temp_homepage_url, &url);
if (error == NSERROR_OK) {
@@ -1054,10 +1058,6 @@ static void gui_init2(int argc, char** argv)
temp_homepage_url = NULL;
}
- if(cli_force == true) {
- notalreadyrunning = TRUE;
- }
-
if(argc == 0) { // WB
struct WBStartup *WBenchMsg = (struct WBStartup *)argv;
struct WBArg *wbarg;
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/gui.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index e08ef59..43dd351 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -1037,6 +1037,10 @@ static void gui_init2(int argc, char** argv)
(nsoption_bool(startup_no_window) == false))
ami_openscreenfirst();
+ if(cli_force == true) {
+ notalreadyrunning = TRUE;
+ }
+
if(temp_homepage_url && notalreadyrunning) {
error = nsurl_create(temp_homepage_url, &url);
if (error == NSERROR_OK) {
@@ -1054,10 +1058,6 @@ static void gui_init2(int argc, char** argv)
temp_homepage_url = NULL;
}
- if(cli_force == true) {
- notalreadyrunning = TRUE;
- }
-
if(argc == 0) { // WB
struct WBStartup *WBenchMsg = (struct WBStartup *)argv;
struct WBArg *wbarg;
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
