From e8fca853df7dcd6bd14722ea610c9a78bfbb7c6b Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 4 Feb 2021 18:00:03 +0100
Subject: [PATCH] unsubscribe on close; self-referencing prevents
 unsubscription

---
 owrx/connection.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index 445d73d2..102b227a 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -161,11 +161,6 @@ class OpenWebRxReceiverClient(OpenWebRxClient, SdrSourceEventClient):
 
         CpuUsageThread.getSharedInstance().add_client(self)
 
-    def __del__(self):
-        if hasattr(self, "configSubs"):
-            while self.configSubs:
-                self.configSubs.pop().cancel()
-
     def setupStack(self):
         stack = PropertyStack()
         # stack layer 0 reserved for sdr properties
@@ -317,6 +312,8 @@ class OpenWebRxReceiverClient(OpenWebRxClient, SdrSourceEventClient):
         self.stopDsp()
         CpuUsageThread.getSharedInstance().remove_client(self)
         ClientRegistry.getSharedInstance().removeClient(self)
+        while self.configSubs:
+            self.configSubs.pop().cancel()
         super().close()
 
     def stopDsp(self):