netsurf: branch master updated. release/3.0-1202-g1ecd56b

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/1ecd56bd716916af845b9... ...commit http://git.netsurf-browser.org/netsurf.git/commit/1ecd56bd716916af845b956... ...tree http://git.netsurf-browser.org/netsurf.git/tree/1ecd56bd716916af845b95632... The branch, master has been updated via 1ecd56bd716916af845b956326601e9bae92885d (commit) from 4ec70fd3a2e75a3295799a685bbeb4dbffcdc05d (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=1ecd56bd716916af845... commit 1ecd56bd716916af845b956326601e9bae92885d Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Fix a case where the screen wouldn't close if NetSurf had been launched from Workbench diff --git a/amiga/gui.c b/amiga/gui.c index c538525..1d89bc5 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -782,6 +782,8 @@ void ami_openscreen(void) } else { + FreeSignal(screen_signal); + if(scrn = LockPubScreen("NetSurf")) { locked_screen = TRUE; @@ -931,10 +933,6 @@ static void gui_init2(int argc, char** argv) int first=0,i=0; char fullpath[1024]; - if (notalreadyrunning && - (nsoption_bool(startup_no_window) == false)) - ami_openscreenfirst(); - for(i=0,wbarg=WBenchMsg->sm_ArgList;i<WBenchMsg->sm_NumArgs;i++,wbarg++) { if(i==0) continue; ----------------------------------------------------------------------- Summary of changes: amiga/gui.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index c538525..1d89bc5 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -782,6 +782,8 @@ void ami_openscreen(void) } else { + FreeSignal(screen_signal); + if(scrn = LockPubScreen("NetSurf")) { locked_screen = TRUE; @@ -931,10 +933,6 @@ static void gui_init2(int argc, char** argv) int first=0,i=0; char fullpath[1024]; - if (notalreadyrunning && - (nsoption_bool(startup_no_window) == false)) - ami_openscreenfirst(); - for(i=0,wbarg=WBenchMsg->sm_ArgList;i<WBenchMsg->sm_NumArgs;i++,wbarg++) { if(i==0) continue; -- NetSurf Browser