diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-12-11 15:17:42 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-12-11 15:18:08 +0000 |
| commit | 34a587849c9999f12d4199d744e7c72204369eab (patch) | |
| tree | def9e71853fb2aadc90d5ddd0d568feb15a73495 | |
| parent | 68e8152f3eb95395cd47e0d703ed709e4ddaef89 (diff) | |
| download | netsurf-34a587849c9999f12d4199d744e7c72204369eab.tar.gz netsurf-34a587849c9999f12d4199d744e7c72204369eab.tar.bz2 | |
Move as much closedown as possible into gui_quit
| -rw-r--r-- | frontends/amiga/gui.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index bff034c41..4d3af0b0d 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -3062,6 +3062,20 @@ static void gui_quit(void) FreeStringClass(urlStringClass); FreeObjList(window_list); + + ami_clipboard_free(); + ami_schedule_free(); + + FreeSysObject(ASOT_PORT, appport); + FreeSysObject(ASOT_PORT, sport); + FreeSysObject(ASOT_PORT, schedulermsgport); + + ami_object_fini(); + ami_bitmap_fini(); + + LOG("Closing screen"); + ami_gui_close_screen(scrn, locked_screen, FALSE); + if(nsscreentitle) FreeVec(nsscreentitle); } char *ami_gui_get_cache_favicon_name(nsurl *url, bool only_if_avail) @@ -5756,25 +5770,11 @@ int main(int argc, char** argv) FreeVec(current_user_faviconcache); FreeVec(current_user); - ami_clipboard_free(); - ami_schedule_free(); - - FreeSysObject(ASOT_PORT, appport); - FreeSysObject(ASOT_PORT, sport); - FreeSysObject(ASOT_PORT, schedulermsgport); - - ami_object_fini(); - ami_bitmap_fini(); - #ifndef __amigaos4__ /* OS3 low memory handler */ ami_memory_fini(memhandler); #endif - LOG("Closing screen"); - ami_gui_close_screen(scrn, locked_screen, FALSE); - if(nsscreentitle) FreeVec(nsscreentitle); - ami_libs_close(); return RETURN_OK; |