Make sure squelch lock is released on de-activate too

src/demod/DemodulatorInstance.cpp

@@ -214,6 +214,7 @@ void DemodulatorInstance::setActive(bool state) {
         }
 #endif
         audioThread->setActive(state);
+        DemodulatorThread::releaseSquelchLock(this);
     } else if (!active && state) {
 #if ENABLE_DIGITAL_LAB
         if (activeOutput && getModemType() == "digital") {

src/demod/DemodulatorThread.cpp

@@ -26,10 +26,7 @@ DemodulatorThread::DemodulatorThread(DemodulatorInstance *parent)
 }
 
 DemodulatorThread::~DemodulatorThread() {
-    std::lock_guard < std::mutex > lock(squelchLockMutex);
+    releaseSquelchLock(demodInstance);
-    if (squelchLock.load() == demodInstance) {
-        squelchLock.store(nullptr);
-    }
 }
 
 void DemodulatorThread::onBindOutput(std::string name, ThreadQueueBase *threadQueue) {
@@ -208,10 +205,7 @@ void DemodulatorThread::run() {
                     }
                 
             } else if (squelched && squelchBreak) {
-                std::lock_guard < std::mutex > lock(squelchLockMutex);
+                releaseSquelchLock(demodInstance);
-                if (squelchLock.load() == demodInstance) {
-                    squelchLock.store(nullptr);
-                }
                 squelchBreak = false;
             }
         }
@@ -403,3 +397,14 @@ void DemodulatorThread::setSquelchLevel(float signal_level_in) {
 float DemodulatorThread::getSquelchLevel() {
     return squelchLevel;
 }
+
+bool DemodulatorThread::getSquelchBreak() {
+    return squelchBreak;
+}
+
+void DemodulatorThread::releaseSquelchLock(DemodulatorInstance *inst) {
+    std::lock_guard < std::mutex > lock(squelchLockMutex);
+    if (squelchLock.load() == inst) {
+        squelchLock.store(nullptr);
+    }
+}

src/demod/DemodulatorThread.h

@@ -37,6 +37,8 @@ public:
 
     bool getSquelchBreak();
 
+    static void releaseSquelchLock(DemodulatorInstance *inst);
+    
 protected:
     
     float abMagnitude(double alpha, double beta, float inphase, float quadrature);