diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-01-21 20:42:49 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-01-21 20:42:49 +0000 |
commit | b41685208f25a906b8a08809e67c2a1a2ec153d9 (patch) | |
tree | 242bf836618e5de28240d7848998bf26e8c2d36b /amiga/gui.c | |
parent | 0cc19b10fcd9f43bb4c9d83654d2d07cad139b12 (diff) | |
download | netsurf-b41685208f25a906b8a08809e67c2a1a2ec153d9.tar.gz netsurf-b41685208f25a906b8a08809e67c2a1a2ec153d9.tar.bz2 |
Revert "alloc bitmap structures using itempools"
This reverts commit 0cc19b10fcd9f43bb4c9d83654d2d07cad139b12.
This caused memory leakage, as the memory pool is removed before the core has destroyed all the bitmaps.
Diffstat (limited to 'amiga/gui.c')
-rw-r--r-- | amiga/gui.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index 9aedad86f..58e7938fd 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -405,21 +405,8 @@ bool ami_locate_resource(char *fullpath, const char *file) return found; } -/* Frees stuff opened by ami_open_resources() */ -static void ami_resources_free(void) -{ - FreeSysObject(ASOT_PORT, appport); - FreeSysObject(ASOT_PORT, sport); - FreeSysObject(ASOT_PORT, schedulermsgport); - - FreeStringClass(urlStringClass); - amiga_bitmap_fini(); -} - static bool ami_open_resources(void) { - if(!amiga_bitmap_init()) return false; - urlStringClass = MakeStringClass(); if(!(appport = AllocSysObjectTags(ASOT_PORT, @@ -3047,10 +3034,13 @@ static void gui_quit(void) LOG("Freeing scheduler resources"); ami_schedule_free(); - ami_resources_free(); + FreeSysObject(ASOT_PORT, appport); + FreeSysObject(ASOT_PORT, sport); + FreeSysObject(ASOT_PORT, schedulermsgport); ami_file_req_free(); ami_openurl_close(); + FreeStringClass(urlStringClass); FreeObjList(window_list); |