Tiled scene chunk loader: clean up when deleted while doing work

DelazJ · Aug 11, 2023 · c6a8e94 · c6a8e94
1 parent fe941e3
commit c6a8e94
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/3d/qgstiledscenechunkloader_p.cpp b/src/3d/qgstiledscenechunkloader_p.cpp
@@ -103,6 +103,16 @@ QgsTiledSceneChunkLoader::QgsTiledSceneChunkLoader( QgsChunkNode *node, const Qg
  mFutureWatcher->setFuture( future );
 }
 
+QgsTiledSceneChunkLoader::~QgsTiledSceneChunkLoader()
+{
+ if ( !mFutureWatcher->isFinished() )
+ {
+ disconnect( mFutureWatcher, &QFutureWatcher<void>::finished, this, &QgsChunkQueueJob::finished );
+ mFutureWatcher->waitForFinished();
+ }
+}
+
+
 Qt3DCore::QEntity *QgsTiledSceneChunkLoader::createEntity( Qt3DCore::QEntity *parent )
 {
  if ( !mEntity )

diff --git a/src/3d/qgstiledscenechunkloader_p.h b/src/3d/qgstiledscenechunkloader_p.h
@@ -56,6 +56,8 @@ class QgsTiledSceneChunkLoader : public QgsChunkLoader
  public:
  QgsTiledSceneChunkLoader( QgsChunkNode *node, const QgsTiledSceneChunkLoaderFactory &factory, const QgsTiledSceneTile &t );
 
+ ~QgsTiledSceneChunkLoader();
+
  virtual Qt3DCore::QEntity *createEntity( Qt3DCore::QEntity *parent );
 
  private: