sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Guard against layer nullptr

Browse Source
This commit is contained in:
Matthias Kuhn 2018-08-26 10:24:34 +02:00
parent 652737dd81
commit ac8eab2fbb
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gui/qgsmaptooladvanceddigitizing.cpp
View File

@ -123,8 +123,12 @@ void QgsMapToolAdvancedDigitizing::activate()
connect( mCadDockWidget, &QgsAdvancedDigitizingDockWidget::pointChanged, this, &QgsMapToolAdvancedDigitizing::cadPointChanged );
mCadDockWidget->enable();
mSnapToGridCanvasItem = new QgsSnapToGridCanvasItem( mCanvas );
mSnapToGridCanvasItem->setCrs( currentVectorLayer()->crs() );
mSnapToGridCanvasItem->setPrecision( currentVectorLayer()->geometryFixes()->geometryPrecision() );
QgsVectorLayer *layer = currentVectorLayer();
if ( layer )
{
mSnapToGridCanvasItem->setCrs( currentVectorLayer()->crs() );
mSnapToGridCanvasItem->setPrecision( currentVectorLayer()->geometryFixes()->geometryPrecision() );
}
mSnapToGridCanvasItem->setEnabled( mSnapToGridEnabled );
}
@ -146,16 +150,20 @@ void QgsMapToolAdvancedDigitizing::cadPointChanged( const QgsPointXY &point )
void QgsMapToolAdvancedDigitizing::onCurrentLayerChanged()
{
QgsVectorLayer *layer = currentVectorLayer();
if ( mSnapToGridCanvasItem && layer && mSnapToGridEnabled )
if ( mSnapToGridCanvasItem )
{
mSnapToGridCanvasItem->setPrecision( layer->geometryFixes()->geometryPrecision() );
mSnapToGridCanvasItem->setCrs( layer->crs() );
mSnapToGridCanvasItem->setEnabled( true );
}
QgsVectorLayer *layer = currentVectorLayer();
if ( layer && mSnapToGridEnabled )
{
mSnapToGridCanvasItem->setPrecision( layer->geometryFixes()->geometryPrecision() );
mSnapToGridCanvasItem->setCrs( layer->crs() );
}
if ( !layer )
mSnapToGridCanvasItem->setEnabled( false );
if ( !layer )
mSnapToGridCanvasItem->setEnabled( false );
else
mSnapToGridCanvasItem->setEnabled( mSnapToGridEnabled );
}
}
bool QgsMapToolAdvancedDigitizing::snapToGridEnabled() const