From 6173bb0e6c3bf51cd463f7bc4f725429d9087b2b Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Tue, 5 Oct 2010 19:14:46 +0000 Subject: Merge treeview-redux to trunk svn path=/trunk/netsurf/; revision=10865 --- amiga/object.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'amiga/object.c') diff --git a/amiga/object.c b/amiga/object.c index a51be81c1..93094cbda 100755 --- a/amiga/object.c +++ b/amiga/object.c @@ -48,14 +48,24 @@ struct nsObject *AddObject(struct MinList *objlist,ULONG otype) return(dtzo); } -void DelObject(struct nsObject *dtzo) +void DelObjectInternal(struct nsObject *dtzo, BOOL free_obj) { Remove((struct Node *)dtzo); - if(dtzo->objstruct) FreeVec(dtzo->objstruct); + if(dtzo->objstruct && free_obj) FreeVec(dtzo->objstruct); FreeVec(dtzo); dtzo = NULL; } +void DelObject(struct nsObject *dtzo) +{ + DelObjectInternal(dtzo, TRUE); +} + +void DelObjectNoFree(struct nsObject *dtzo) +{ + DelObjectInternal(dtzo, FALSE); +} + void FreeObjList(struct MinList *objlist) { struct nsObject *node; -- cgit v1.2.3