r10950 chris_y - /trunk/netsurf/amiga/gui.c

netsurf at semichrome.net netsurf at semichrome.net
Sun Nov 21 23:30:35 GMT 2010


Author: chris_y
Date: Sun Nov 21 17:30:35 2010
New Revision: 10950

URL: http://source.netsurf-browser.org?rev=10950&view=rev
Log:
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.

Modified:
    trunk/netsurf/amiga/gui.c

Modified: trunk/netsurf/amiga/gui.c
URL: http://source.netsurf-browser.org/trunk/netsurf/amiga/gui.c?rev=10950&r1=10949&r2=10950&view=diff
==============================================================================
--- trunk/netsurf/amiga/gui.c (original)
+++ trunk/netsurf/amiga/gui.c Sun Nov 21 17:30:35 2010
@@ -2047,23 +2047,13 @@
 
 	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();




More information about the netsurf-commits mailing list