diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2011-06-19 11:16:48 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2011-06-19 11:16:48 +0000 |
| commit | 548e1f2f774ab2282eb7ea95dfde5d5f78ded29c (patch) | |
| tree | 911f4a4bbfec5f7bfc8d4da5eb41980f0605cb48 /amiga | |
| parent | e61ad6326a48f00f282f18e35f39662fd32c1ca2 (diff) | |
| download | netsurf-548e1f2f774ab2282eb7ea95dfde5d5f78ded29c.tar.gz netsurf-548e1f2f774ab2282eb7ea95dfde5d5f78ded29c.tar.bz2 | |
Ensure the WB screen gets unlocked, avoid passing a NULL to CloseScreen
svn path=/trunk/netsurf/; revision=12491
Diffstat (limited to 'amiga')
| -rwxr-xr-x | amiga/gui.c | 11 |
1 files changed, 6 insertions, 5 deletions
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...")); |