From 59755a043eb8b98b4e17b13e756d4255998f0ef6 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 5 May 2022 10:44:00 +0200 Subject: [PATCH] distributed: Fix regression from c917a9e (which was fix for #1262) With that fix, getDatagram would return the wrong result after the datagram was reassigned in C++ --- direct/src/distributed/PyDatagramIterator.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/direct/src/distributed/PyDatagramIterator.py b/direct/src/distributed/PyDatagramIterator.py index 13c810e90d..591734c0dc 100755 --- a/direct/src/distributed/PyDatagramIterator.py +++ b/direct/src/distributed/PyDatagramIterator.py @@ -35,15 +35,13 @@ class PyDatagramIterator(DatagramIterator): super().__init__(datagram, offset) # Retain a reference to it so that it doesn't get deleted. - self.__datagram = datagram + self.__initialDatagram = datagram else: super().__init__() - def getDatagram(self): - return self.__datagram - - def get_datagram(self): - return self.__datagram + def assign(self, datagram, offset = 0): + super().assign(datagram, offset) + self.__initialDatagram = datagram def getArg(self, subatomicType, divisor=1): # Import the type numbers