doneBarrier() may be legally be called with no barrier received

This commit is contained in:
David Rose 2003-11-06 06:54:34 +00:00
parent ebc8e02136
commit ac53a4e660

View File

@ -304,8 +304,13 @@ class DistributedObject(PandaObject):
def doneBarrier(self):
# Tells the AI we have finished handling our task.
assert(self.__barrierContext != None)
self.sendUpdate("doBarrierReady", [self.__barrierContext])
self.__barrierContext = None
# If this is None, it either means we have called
# doneBarrier() twice, or we have not received a barrier
# context from the AI. I think in either case it's ok to
# silently ignore the error.
if self.__barrierContext != None:
self.sendUpdate("doBarrierReady", [self.__barrierContext])
self.__barrierContext = None