Fix crash on destruction of QgsPointLocator, if object is destroyed

while indexing is happening in the background
qgis · Jan 28, 2020 · 08adb23 · 08adb23
1 parent 01d0c59
commit 08adb23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
@@ -549,6 +549,7 @@ QgsPointLocator::QgsPointLocator( QgsVectorLayer *layer, const QgsCoordinateRefe
 QgsPointLocator::~QgsPointLocator()
 {
   // don't delete a locator if there is an indexing task running on it
+  mIsDestroying = true;
   if ( mIsIndexing )
     waitForIndexingFinished();
 
@@ -597,6 +598,9 @@ void QgsPointLocator::onInitTaskFinished()
   if ( !mIsIndexing )
     return;
 
+  if ( mIsDestroying )
+    return;
+
   mIsIndexing = false;
   mRenderer.reset();
   mSource.reset();
@@ -652,7 +656,8 @@ void QgsPointLocator::waitForIndexingFinished()
 {
   mInitTask->waitForFinished();
 
-  onInitTaskFinished();
+  if ( !mIsDestroying )
+    onInitTaskFinished();
 }
 
 bool QgsPointLocator::hasIndex() const

diff --git a/src/core/qgspointlocator.h b/src/core/qgspointlocator.h
@@ -389,6 +389,7 @@ class CORE_EXPORT QgsPointLocator : public QObject
     std::unique_ptr<QgsVectorLayerFeatureSource> mSource;
     int mMaxFeaturesToIndex = -1;
     bool mIsIndexing = false;
+    bool mIsDestroying = false;
     QgsFeatureIds mAddedFeatures;
     QgsFeatureIds mDeletedFeatures;
     QPointer<QgsPointLocatorInitTask> mInitTask;