Skip to content

Commit 6c97fcf

Browse files
committed
Avoid crash when disconnecting layer
1 parent 8da2910 commit 6c97fcf

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

src/app/qgsgeometryvalidationdock.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ void QgsGeometryValidationDock::onCurrentLayerChanged( QgsMapLayer *layer )
265265
{
266266
disconnect( mCurrentLayer, &QgsVectorLayer::editingStarted, this, &QgsGeometryValidationDock::onLayerEditingStatusChanged );
267267
disconnect( mCurrentLayer, &QgsVectorLayer::editingStopped, this, &QgsGeometryValidationDock::onLayerEditingStatusChanged );
268+
disconnect( mCurrentLayer, &QgsVectorLayer::destroyed, this, &QgsGeometryValidationDock::onLayerDestroyed );
268269
}
269270

270271
mCurrentLayer = qobject_cast<QgsVectorLayer *>( layer );
@@ -273,6 +274,7 @@ void QgsGeometryValidationDock::onCurrentLayerChanged( QgsMapLayer *layer )
273274
{
274275
connect( mCurrentLayer, &QgsVectorLayer::editingStarted, this, &QgsGeometryValidationDock::onLayerEditingStatusChanged );
275276
connect( mCurrentLayer, &QgsVectorLayer::editingStopped, this, &QgsGeometryValidationDock::onLayerEditingStatusChanged );
277+
connect( mCurrentLayer, &QgsVectorLayer::destroyed, this, &QgsGeometryValidationDock::onLayerDestroyed );
276278
}
277279

278280
onLayerEditingStatusChanged();
@@ -297,6 +299,12 @@ void QgsGeometryValidationDock::onLayerEditingStatusChanged()
297299
mTopologyChecksPendingButton->setEnabled( enabled );
298300
}
299301

302+
void QgsGeometryValidationDock::onLayerDestroyed( QObject *layer )
303+
{
304+
if ( layer == mCurrentLayer )
305+
mCurrentLayer = nullptr;
306+
}
307+
300308
void QgsGeometryValidationDock::showHighlight( const QModelIndex &current )
301309
{
302310
QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mMapCanvas->currentLayer() );

src/app/qgsgeometryvalidationdock.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ class QgsGeometryValidationDock : public QgsDockWidget, public Ui_QgsGeometryVal
4848
void onCurrentErrorChanged( const QModelIndex &current, const QModelIndex &previous );
4949
void onCurrentLayerChanged( QgsMapLayer *layer );
5050
void onLayerEditingStatusChanged();
51+
void onLayerDestroyed( QObject *layer );
5152
void gotoNextError();
5253
void gotoPreviousError();
5354
void zoomToProblem();

0 commit comments

Comments
 (0)