unsubscribe on close; self-referencing prevents unsubscription

This commit is contained in:
Jakob Ketterl 2021-02-04 18:00:03 +01:00
parent d6d6d97a13
commit e8fca853df

View File

@ -161,11 +161,6 @@ class OpenWebRxReceiverClient(OpenWebRxClient, SdrSourceEventClient):
CpuUsageThread.getSharedInstance().add_client(self) CpuUsageThread.getSharedInstance().add_client(self)
def __del__(self):
if hasattr(self, "configSubs"):
while self.configSubs:
self.configSubs.pop().cancel()
def setupStack(self): def setupStack(self):
stack = PropertyStack() stack = PropertyStack()
# stack layer 0 reserved for sdr properties # stack layer 0 reserved for sdr properties
@ -317,6 +312,8 @@ class OpenWebRxReceiverClient(OpenWebRxClient, SdrSourceEventClient):
self.stopDsp() self.stopDsp()
CpuUsageThread.getSharedInstance().remove_client(self) CpuUsageThread.getSharedInstance().remove_client(self)
ClientRegistry.getSharedInstance().removeClient(self) ClientRegistry.getSharedInstance().removeClient(self)
while self.configSubs:
self.configSubs.pop().cancel()
super().close() super().close()
def stopDsp(self): def stopDsp(self):