From 4c6c4dda3ec23b0ccf32e1a937b8813345446d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?= <grubba@grubba.org> Date: Wed, 31 Mar 1999 00:00:28 +0200 Subject: [PATCH] destroy() should now be able to use parent. Rev: src/object.c:1.54 --- src/object.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/object.c b/src/object.c index 0e2a51786c..8bcee98f89 100644 --- a/src/object.c +++ b/src/object.c @@ -4,7 +4,7 @@ ||| See the files COPYING and DISCLAIMER for more information. \*/ #include "global.h" -RCSID("$Id: object.c,v 1.53 1998/11/22 11:03:04 hubbe Exp $"); +RCSID("$Id: object.c,v 1.54 1999/03/30 22:00:28 grubba Exp $"); #include "object.h" #include "dynamic_buffer.h" #include "interpret.h" @@ -439,12 +439,6 @@ void really_free_object(struct object *o) if(--o->refs > 0) return; } - if(o->parent) - { - free_object(o->parent); - o->parent=0; - } - if(o->prev) o->prev->next=o->next; else @@ -465,6 +459,12 @@ void really_free_object(struct object *o) o->prev=0; objects_to_destruct=o; } else { + if(o->parent) + { + free_object(o->parent); + o->parent=0; + } + free((char *)o); GC_FREE(); } -- GitLab