Prevent destructor from starting when fitsview is being updated

Olli781 · Apr 12, 2022 · 752ed71 · 752ed71
1 parent b028a6e
commit 752ed71
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/kstars/fitsviewer/fitsview.cpp b/kstars/fitsviewer/fitsview.cpp
@@ -36,6 +36,7 @@
 #include <QApplication>
 #include <QImageReader>
 #include <QGestureEvent>
+#include <QMutexLocker>
 
 #ifndef _WIN32
 #include <unistd.h>
@@ -208,20 +209,7 @@ FITSView::FITSView(QWidget * parent, FITSMode fitsMode, FITSScale filterType) :
     m_UpdateFrameTimer.setSingleShot(true);
     connect(&m_UpdateFrameTimer, &QTimer::timeout, this, [this]()
     {
-        if (m_ImageFrame)
-        {
-            if (toggleStretchAction)
-                toggleStretchAction->setChecked(stretchImage);
-
-            // We employ two schemes for managing the image and its overlays, depending on the size of the image
-            // and whether we need to therefore conserve memory. The small-image strategy explicitly scales up
-            // the image, and writes overlays on the scaled pixmap. The large-image strategy uses a pixmap that's
-            // the size of the image itself, never scaling that up.
-            if (isLargeImage())
-                updateFrameLargeImage();
-            else
-                updateFrameSmallImage();
-        }
+        this->updateFrame(true);
     });
 
     connect(&fitsWatcher, &QFutureWatcher<bool>::finished, this, &FITSView::loadInFrame);
@@ -242,7 +230,9 @@ FITSView::FITSView(QWidget * parent, FITSMode fitsMode, FITSScale filterType) :
 
 FITSView::~FITSView()
 {
+    QMutexLocker locker(&updateMutex);
     m_UpdateFrameTimer.stop();
+    m_Suspended = true;
     fitsWatcher.waitForFinished();
     wcsWatcher.waitForFinished();
 }
@@ -747,6 +737,8 @@ double FITSView::scaleSize(double size)
 
 void FITSView::updateFrame(bool now)
 {
+    QMutexLocker locker(&updateMutex);
+
     // Do not process if suspended.
     if (m_Suspended)
         return;

diff --git a/kstars/fitsviewer/fitsview.h b/kstars/fitsviewer/fitsview.h
@@ -45,8 +45,8 @@ class FITSData;
 class FITSLabel;
 
 class FITSView : public QScrollArea
-{    
-        Q_OBJECT    
+{
+        Q_OBJECT
         Q_PROPERTY(bool suspended MEMBER m_Suspended)
 
     public:
@@ -429,6 +429,8 @@ class FITSView : public QScrollArea
         bool showMagnifyingGlass { false };
         bool m_Suspended {false};
 
+        QMutex updateMutex;
+
         //Star Profile Viewer
 #ifdef HAVE_DATAVISUALIZATION
         QPointer<StarProfileViewer> starProfileWidget;