sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid crash from storage of potentially removed map layer storage in canvas

Browse Source
This commit is contained in:
Nyall Dawson 2018-08-17 10:33:24 +10:00
parent 8075368638
commit 56b6ebd91c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/qgsmapcanvas.cpp
View File

@ -285,6 +285,9 @@ QgsMapLayer *QgsMapCanvas::layer( int index )
void QgsMapCanvas::setCurrentLayer( QgsMapLayer *layer ) void QgsMapCanvas::setCurrentLayer( QgsMapLayer *layer )
{ {
if ( mCurrentLayer == layer )
return;
mCurrentLayer = layer; mCurrentLayer = layer;
emit currentLayerChanged( layer ); emit currentLayerChanged( layer );
} }

2
src/gui/qgsmapcanvas.h
View File

@ -928,7 +928,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView
bool mRenderFlag = true; bool mRenderFlag = true;
//! current layer in legend //! current layer in legend
QgsMapLayer *mCurrentLayer = nullptr; QPointer< QgsMapLayer > mCurrentLayer;
//! graphics scene manages canvas items //! graphics scene manages canvas items
QGraphicsScene *mScene = nullptr; QGraphicsScene *mScene = nullptr;