summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2010-11-21 23:30:35 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2010-11-21 23:30:35 +0000
commitc14f335454afc9b16d3532f0e6dfc1a2ca36b180 (patch)
tree21949d4e32d38f5ae0cea264d10cdd564491cb39
parent71ea71540ab637dbec6d715ed9a157542a9ff03f (diff)
downloadnetsurf-c14f335454afc9b16d3532f0e6dfc1a2ca36b180.tar.gz
netsurf-c14f335454afc9b16d3532f0e6dfc1a2ca36b180.tar.bz2
Fix serious crash if NetSurf is running twice (once with the FORCE switch) on a
NetSurf-created public screen, and the sessions are quit in the reverse order to which they were launched. svn path=/trunk/netsurf/; revision=10950
-rwxr-xr-xamiga/gui.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index 0d13a2145..4eec25581 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -2047,24 +2047,14 @@ void gui_quit(void)
ami_close_fonts();
- if(!locked_screen) /* set if we are using somebody else's screen */
- {
- while(!CloseScreen(scrn));
- }
- else
- {
- /* have a go at closing the public screen, apparently this is OK to do */
- CloseScreen(scrn);
- }
+ /* Have a go at closing the public screen, apparently this is OK to do
+ even if it isn't our screen (ie. locked_screen != NULL) */
+ CloseScreen(scrn);
FreeVec(nsscreentitle);
if(option_context_menu) ami_context_menu_free();
-/* fixme: need newmenu struct propd to this function - should this be freed here?
- ami_free_menulabs(menu);
-*/
-
ami_mouse_pointers_free();
ami_clipboard_free();
ami_print_free();