sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-12 00:02:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't delete locator while indexing

Browse Source
This commit is contained in:
Julien Cabieces 2019-10-30 11:06:14 +01:00
parent d0e26fb3bc
commit 95a100bcc4
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/qgspointlocator.cpp
View File

@ -548,6 +548,10 @@ QgsPointLocator::QgsPointLocator( QgsVectorLayer *layer, const QgsCoordinateRefe
QgsPointLocator::~QgsPointLocator()
{
// don't delete a locator if there is an indexing task running on it
if ( mIsIndexing )
waitForIndexingFinished();
destroyIndex();
}

10
tests/src/core/testqgspointlocator.cpp
View File

@ -464,6 +464,16 @@ class TestQgsPointLocator : public QObject
QCOMPARE( m.vertexIndex(), 2 );
}
void testDeleteLocator()
{
QgsPointLocator *loc = new QgsPointLocator( mVL, QgsCoordinateReferenceSystem(), QgsCoordinateTransformContext(), nullptr );
QgsPointXY pt( 2, 2 );
// delete locator while we are indexing (could happend when closing project for instance)
loc->nearestVertex( pt, 999, nullptr, true );
delete loc;
}
};
QGSTEST_MAIN( TestQgsPointLocator )