From 48afd0be45a8d996a45e6316d0609632342a246d Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Wed, 22 Sep 2021 01:20:01 +0100
Subject: [PATCH] Remove the use of QRecursiveMutex

---
 app/CMakeLists.txt       | 1 +
 app/CalypAppModuleIf.cpp | 2 ++
 app/CalypAppModuleIf.h   | 2 +-
 modules/CMakeLists.txt   | 2 --
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index c68ac29..3ddcb1f 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -10,6 +10,7 @@ INCLUDE_DIRECTORIES(
 OPTION(USE_QTDBUS "Build with QtDBus" ON)
 OPTION(USE_FERVOR "Add Fervor support" OFF)
 OPTION(CALYP_MANAGED_RESOURCES "Handle streams in separate threads" ON)
+OPTION(CALYP_THREADED_MODULES "Use threads for modules" ON)
 
 ADD_SUBDIRECTORY(external)
 
diff --git a/app/CalypAppModuleIf.cpp b/app/CalypAppModuleIf.cpp
index 34f261f..eafb878 100644
--- a/app/CalypAppModuleIf.cpp
+++ b/app/CalypAppModuleIf.cpp
@@ -239,6 +239,8 @@ void CalypAppModuleIf::disable()
   QApplication::setOverrideCursor( Qt::WaitCursor );
 #ifdef CALYP_THREADED_MODULES
   QMutexLocker locker( &m_Mutex );
+  m_Mutex.lock();
+  m_Mutex.unlock();
 #endif
   m_frameList.clear();
   m_frameListPtr.clear();
diff --git a/app/CalypAppModuleIf.h b/app/CalypAppModuleIf.h
index fbbdc0e..6958c9a 100644
--- a/app/CalypAppModuleIf.h
+++ b/app/CalypAppModuleIf.h
@@ -118,7 +118,7 @@ private:
   double m_dMeasurementResult{ 0 };
 
 #ifdef CALYP_THREADED_MODULES
-  QRecursiveMutex m_Mutex;
+  QMutex m_Mutex;
 #endif
 };
 
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 538c35b..735dfe3 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -1,8 +1,6 @@
 #
 # CMakeLists for calyp modules component
 #
-
-OPTION(CALYP_THREADED_MODULES "Use threads for modules" ON)
 SET(CALYP_EXTRA_MODULES_DIR
     "CALYP_EXTRA_MODULES_DIR"
     CACHE PATH "Location of extra Calyp modules"