Start: Add interruption checks during run

Author: chennes

src/Mod/Start/App/ThumbnailSource.cpp

@@ -29,6 +29,9 @@
 #endif
 
 #include "ThumbnailSource.h"
+
+#include <QThread>
+
 #include "FileUtilities.h"
 
 #include <App/Application.h>
@@ -45,6 +48,14 @@ ThumbnailSource::ThumbnailSource(QString file)
     : _file(std::move(file))
 {}
 
+ThumbnailSource::~ThumbnailSource()
+{
+    if (_process && _process->state() == QProcess::Running) {
+        _process->kill();
+        _process->waitForFinished();
+    }
+}
+
 ThumbnailSourceSignals* ThumbnailSource::signals()
 {
     return &_signals;
@@ -64,10 +75,18 @@ void ThumbnailSource::run()
         QStringList args(_f3dBaseArgs);
         args << QLatin1String("--output=") + thumbnailPath << _file;
 
-        QProcess process;
-        process.start(f3d, args);
-        process.waitForFinished();
-        if (process.exitCode() != 0) {
+        _process = std::make_unique<QProcess>();
+        _process->start(f3d, args);
+
+        // Since this is running on a non-GUI thread, poll for an interruption request while running
+        // so that external code can kill the process if necessary.
+        constexpr int checkEveryMs {50};
+        while (_process->waitForFinished(checkEveryMs)) {
+            if (QThread::currentThread()->isInterruptionRequested()) {
+                _process->kill();
+            }
+        }
+        if (_process->exitCode() != 0) {
             return;
         }
     }

src/Mod/Start/App/ThumbnailSource.h

@@ -21,16 +21,17 @@
  *                                                                          *
  ***************************************************************************/
 
-#ifndef FREECAD_THUMBNAILSOURCE_H
-#define FREECAD_THUMBNAILSOURCE_H
+#ifndef FREECAD_THUMBNAIL_SOURCE_H
+#define FREECAD_THUMBNAIL_SOURCE_H
 
-#include <QByteArray>
 #include <QRunnable>
 #include <QString>
 #include <QObject>
 #include <QMutex>
 #include <QStringList>
 
+class QProcess;
+
 namespace Start
 {
 
@@ -47,6 +48,7 @@ class ThumbnailSource: public QRunnable
 {
 public:
     explicit ThumbnailSource(QString file);
+    ~ThumbnailSource() override;
 
     void run() override;
 
@@ -57,6 +59,8 @@ class ThumbnailSource: public QRunnable
 
     QString _file;
     ThumbnailSourceSignals _signals;
+    std::unique_ptr<QProcess> _process;
+
     static bool _f3dInitialized;
     static int _f3dMajor;
     static int _f3dMinor;
@@ -66,4 +70,4 @@ class ThumbnailSource: public QRunnable
 
 }  // namespace Start
 
-#endif  // FREECAD_THUMBNAILSOURCE_H
+#endif  // FREECAD_THUMBNAIL_SOURCE_H