Browse Source

previous checkin, causes a new crash on calling delete multiple times, this fixes that

Asad M. Zaman 20 years ago
parent
commit
c282655222
1 changed files with 7 additions and 6 deletions
  1. 7 6
      direct/src/distributed/DistributedObjectAI.py

+ 7 - 6
direct/src/distributed/DistributedObjectAI.py

@@ -122,15 +122,16 @@ class DistributedObjectAI(DirectObject):
                 barrier.cleanup()
             self.__barriers = {}
 
-            if not hasattr(self, "doNotDeallocateChannel"):
-                if self.air:
-                    self.air.deallocateChannel(self.doId)
-            # Asad: As per Roger's suggestion, turn off the following line until a solution is
+            # Asad: As per Roger's suggestion, turn off the following block until a solution is
             # Thought out of how to prevent this delete message or to handle this message better
-            #self.air = None
+##             if not hasattr(self, "doNotDeallocateChannel"):
+##                 if self.air:
+##                     self.air.deallocateChannel(self.doId)
+##             self.air = None
             if hasattr(self, 'parentId'):
                 del self.parentId
-            del self.zoneId
+            if hasattr(self, 'zoneId'):
+                del self.zoneId
             self.__generated = False
 
     def isDeleted(self):