mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-20 11:12:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Free shared_pens list on tree destroy

Browse Source
This commit is contained in:
Chris Young 2016-02-14 15:42:58 +00:00
parent 86247eea59
commit 3b57ce1013
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
amiga/object.c
View File

@ -53,7 +53,7 @@ void ami_object_fini(void)
} }
/* Slightly abstract MinList initialisation */ /* Slightly abstract MinList initialisation */
void ami_NewMinList(struct MinList *list) static void ami_NewMinList(struct MinList *list)
{ {
if(list == NULL) return; if(list == NULL) return;
NewnsList((struct nsList *)list); NewnsList((struct nsList *)list);

9
amiga/tree.c
View File

@ -130,6 +130,7 @@ static void ami_tree_get_window_dimensions(int *width, int *height, void *data);
void ami_tree_destroy(struct treeview_window *twin) void ami_tree_destroy(struct treeview_window *twin)
{ {
tree_delete(twin->tree); tree_delete(twin->tree);
FreeVec(twin->shared_pens);
FreeVec(twin); FreeVec(twin);
} }
@ -733,8 +734,6 @@ void ami_tree_open(struct treeview_window *twin,int type)
twin->scrollerhook.h_Entry = (void *)ami_tree_scroller_hook; twin->scrollerhook.h_Entry = (void *)ami_tree_scroller_hook;
twin->scrollerhook.h_Data = twin; twin->scrollerhook.h_Data = twin;
twin->shared_pens = ami_AllocMinList();
twin->globals.shared_pens = twin->shared_pens;
ami_init_layers(&twin->globals, 0, 0, false); ami_init_layers(&twin->globals, 0, 0, false);
ami_tree_menu(twin); ami_tree_menu(twin);
@ -889,7 +888,6 @@ void ami_tree_close(struct treeview_window *twin)
DelObjectNoFree(twin->node); DelObjectNoFree(twin->node);
ami_plot_release_pens(twin->shared_pens); ami_plot_release_pens(twin->shared_pens);
ami_free_layers(&twin->globals); ami_free_layers(&twin->globals);
FreeVec(twin->shared_pens);
for(i=0;i<AMI_TREE_MENU_ITEMS;i++) { for(i=0;i<AMI_TREE_MENU_ITEMS;i++) {
if(twin->menu_name[i] && (twin->menu_name[i] != NM_BARLABEL)) if(twin->menu_name[i] && (twin->menu_name[i] != NM_BARLABEL))
@ -1459,9 +1457,12 @@ struct treeview_window *ami_tree_create(int flags,
return NULL; return NULL;
} }
twin->shared_pens = ami_AllocMinList();
twin->globals.shared_pens = twin->shared_pens;
twin->ssl_data = ssl_data; twin->ssl_data = ssl_data;
twin->tree = tree_create(flags, &ami_tree_callbacks, twin); twin->tree = tree_create(flags, &ami_tree_callbacks, twin);
return twin; return twin;
} }