From 3cca3f82ed16c3c36a21ba3c70ab0dcbe34173cc Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 28 Jan 2024 17:04:35 +0100
Subject: [PATCH] improve reader handling

---
 owrx/fft.py | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/owrx/fft.py b/owrx/fft.py
index dd1f10d3..9ad88e91 100644
--- a/owrx/fft.py
+++ b/owrx/fft.py
@@ -72,14 +72,16 @@ class SpectrumThread(SdrSourceEventClient):
         self.reader = buffer.getReader()
         threading.Thread(target=self.dsp.pump(self.reader.read, self.sdrSource.writeSpectrumData)).start()
 
-    def stop(self):
+    def stopDsp(self):
         if self.dsp is None:
             return
         self.dsp.stop()
         self.dsp = None
-        if self.reader:
-            self.reader.stop()
-            self.reader = None
+        self.reader.stop()
+        self.reader = None
+
+    def stop(self):
+        self.stopDsp()
         self.sdrSource.removeClient(self)
         while self.subscriptions:
             self.subscriptions.pop().cancel()
@@ -93,8 +95,7 @@ class SpectrumThread(SdrSourceEventClient):
 
     def onStateChange(self, state: SdrSourceState):
         if state is SdrSourceState.STOPPING:
-            if self.dsp:
-                self.dsp.stop()
+            self.stopDsp()
         elif state == SdrSourceState.RUNNING:
             if self.dsp is None:
                 self.start()
@@ -102,11 +103,7 @@ class SpectrumThread(SdrSourceEventClient):
                 self.dsp.setReader(self.sdrSource.getBuffer().getReader())
 
     def onFail(self):
-        if self.dsp is None:
-            return
-        self.dsp.stop()
+        self.stopDsp()
 
     def onShutdown(self):
-        if self.dsp is None:
-            return
-        self.dsp.stop()
+        self.stopDsp()