From 53bb100ad4b5e99a5e594cd4465be9848afd744a Mon Sep 17 00:00:00 2001
From: Joao Carreira <jfmcarreira@gmail.com>
Date: Wed, 29 Sep 2021 23:36:53 +0100
Subject: [PATCH] Fix bug removing a module

---
 app/CalypAppModuleIf.cpp    | 12 +++++++-----
 app/VideoSubWindow.cpp      |  2 +-
 modules/FrameDifference.cpp |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/CalypAppModuleIf.cpp b/app/CalypAppModuleIf.cpp
index eafb878..e165bf2 100644
--- a/app/CalypAppModuleIf.cpp
+++ b/app/CalypAppModuleIf.cpp
@@ -219,13 +219,16 @@ void CalypAppModuleIf::show()
 #ifdef CALYP_THREADED_MODULES
     if( m_Mutex.try_lock() )
     {
-      m_pcDisplaySubWindow->setFillWindow( false );
-      m_pcDisplaySubWindow->setCurrFrame( m_pcProcessedFrame );
+      displayWindow->setFillWindow( false );
+      displayWindow->setCurrFrame( m_pcProcessedFrame );
       m_Mutex.unlock();
     }
+    else
+    {
 #endif
-    m_pcDisplaySubWindow->setFillWindow( false );
-    m_pcDisplaySubWindow->setCurrFrame( m_pcProcessedFrame );
+      displayWindow->setFillWindow( false );
+      displayWindow->setCurrFrame( m_pcProcessedFrame );
+    }
     break;
   }
   case CLP_FRAME_MEASUREMENT_MODULE:
@@ -238,7 +241,6 @@ void CalypAppModuleIf::disable()
 {
   QApplication::setOverrideCursor( Qt::WaitCursor );
 #ifdef CALYP_THREADED_MODULES
-  QMutexLocker locker( &m_Mutex );
   m_Mutex.lock();
   m_Mutex.unlock();
 #endif
diff --git a/app/VideoSubWindow.cpp b/app/VideoSubWindow.cpp
index 6599c42..ef2072d 100644
--- a/app/VideoSubWindow.cpp
+++ b/app/VideoSubWindow.cpp
@@ -770,8 +770,8 @@ bool VideoSubWindow::disableAllModules()
   while( m_associatedModules.size() > 0 )
   {
     auto module = m_associatedModules.back();
-    module->disable();
     m_associatedModules.pop_back();
+    module->disable();
   }
   return true;
 }
diff --git a/modules/FrameDifference.cpp b/modules/FrameDifference.cpp
index d62fa2b..96b6422 100644
--- a/modules/FrameDifference.cpp
+++ b/modules/FrameDifference.cpp
@@ -31,7 +31,7 @@ FrameDifference::FrameDifference()
   m_iModuleType = CLP_FRAME_PROCESSING_MODULE;
   m_pchModuleCategory = "Measurements";
   m_pchModuleName = "FrameDifference";
-  m_pchModuleName = "Difference";
+  m_pchModuleLongName = "Difference";
   m_pchModuleTooltip = "Measure the difference between two images (Y plane),  "
                        "Y1 - Y2, with max absolute diff of 128";
   m_uiModuleRequirements = CLP_MODULE_REQUIRES_NEW_WINDOW | CLP_MODULE_REQUIRES_OPTIONS;