From 9865d5510a246b6a9d5bf778ae86b06d938be520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Sat, 21 Mar 1998 22:21:25 -0800
Subject: [PATCH] it is now possible to use parent in destroy()
Rev: src/object.c:1.42
---
src/object.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/object.c b/src/object.c
index 71e33cfdc3..c0628d0262 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.41 1998/02/19 21:38:45 hubbe Exp $");
+RCSID("$Id: object.c,v 1.42 1998/03/22 06:21:25 hubbe Exp $");
#include "object.h"
#include "dynamic_buffer.h"
#include "interpret.h"
@@ -237,12 +237,6 @@ void destruct(struct object *o)
o->refs++;
- if(o->parent)
- {
- free_object(o->parent);
- o->parent=0;
- }
-
e=FIND_LFUN(o->prog,LFUN_DESTROY);
if(e != -1)
{
@@ -259,6 +253,12 @@ void destruct(struct object *o)
o->prog=0;
+ if(o->parent)
+ {
+ free_object(o->parent);
+ o->parent=0;
+ }
+
frame.parent_frame=fp;
frame.current_object=o; /* refs already updated */
frame.locals=0;
--
GitLab