From 548e1f2f774ab2282eb7ea95dfde5d5f78ded29c Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sun, 19 Jun 2011 11:16:48 +0000
Subject: Ensure the WB screen gets unlocked, avoid passing a NULL to
 CloseScreen

svn path=/trunk/netsurf/; revision=12491
---
 amiga/gui.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'amiga/gui.c')

diff --git a/amiga/gui.c b/amiga/gui.c
index 6c4f4ff8b..bc89b0132 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -572,14 +572,13 @@ void ami_openscreen(void)
 
 	if(option_use_pubscreen && option_use_pubscreen[0] != '\0')
 	{
-		if(scrn = LockPubScreen(option_use_pubscreen))
-		{
-			locked_screen = TRUE;
-		}
-		else
+		scrn = LockPubScreen(option_use_pubscreen);
+
+		if(scrn == NULL)
 		{
 			scrn = LockPubScreen("Workbench");
 		}
+		locked_screen = TRUE;
 	}
 	dri = GetScreenDrawInfo(scrn);
 	ami_font_setdevicedpi(id);
@@ -705,6 +704,7 @@ static void gui_init2(int argc, char** argv)
 		IDoMethod(arexx_obj,AM_EXECUTE,sendcmd,"NETSURF",NULL,NULL,NULL,NULL);
 		IDoMethod(arexx_obj,AM_EXECUTE,"TOFRONT","NETSURF",NULL,NULL,NULL,NULL);
 		FreeVec(sendcmd);
+
 		netsurf_quit=true;
 		return;
 	}
@@ -2160,6 +2160,7 @@ void ami_gui_close_screen(struct Screen *scrn)
 {
 	ULONG scrnsig = 1 << screen_signal;
 
+	if(scrn == NULL) return;
 	if(CloseScreen(scrn)) return;
 
 	LOG(("Waiting for visitor windows to close..."));
-- 
cgit v1.2.3