diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-02-10 20:18:18 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2014-02-10 20:18:18 +0000 |
| commit | e975b355f54212adfcd6b3a8e32fede621098a31 (patch) | |
| tree | a4f23e1ddfdeab2a4bf2a6e423c2d82c674bbd6d /amiga | |
| parent | a6fd3284050532f43261ddce8972e03e6669bd94 (diff) | |
| download | netsurf-e975b355f54212adfcd6b3a8e32fede621098a31.tar.gz netsurf-e975b355f54212adfcd6b3a8e32fede621098a31.tar.bz2 | |
Don't wait for the screen to close unless we're actually quitting.
Diffstat (limited to 'amiga')
| -rw-r--r-- | amiga/gui.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index fc33b1fcd..c5ef66907 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -2755,7 +2755,7 @@ void ami_quit_netsurf_delayed(void) } } -void ami_gui_close_screen(struct Screen *scrn, BOOL locked_screen) +void ami_gui_close_screen(struct Screen *scrn, BOOL locked_screen, BOOL donotwait) { if(scrn == NULL) return; if(CloseScreen(scrn) == TRUE) { @@ -2767,6 +2767,7 @@ void ami_gui_close_screen(struct Screen *scrn, BOOL locked_screen) return; } if(locked_screen == TRUE) return; + if(donotwait == TRUE) return; /* If this is our own screen, wait for visitor windows to close */ if(screen_signal != -1) { @@ -2794,7 +2795,7 @@ void ami_try_quit(void) } else { - ami_gui_close_screen(scrn, locked_screen); + ami_gui_close_screen(scrn, locked_screen, TRUE); } } @@ -2820,7 +2821,7 @@ static void gui_quit(void) ami_close_fonts(); LOG(("Closing screen")); - ami_gui_close_screen(scrn, locked_screen); + ami_gui_close_screen(scrn, locked_screen, FALSE); FreeVec(nsscreentitle); LOG(("Freeing menu items")); |