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

[layertree] Fix possible crash when removing layers

Browse Source
This commit is contained in:
Martin Dobias 2014-06-11 13:41:11 +07:00
parent df85395ee4
commit f04ea99e0f
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/layertree/qgslayertreeregistrybridge.cpp
View File

@ -25,6 +25,7 @@
QgsLayerTreeRegistryBridge::QgsLayerTreeRegistryBridge( QgsLayerTreeGroup *root, QObject *parent )
: QObject( parent )
, mRoot( root )
, mRegistryRemovingLayers( false )
, mEnabled( true )
, mNewLayersVisible( true )
, mInsertionPointGroup( root )
@ -74,12 +75,18 @@ void QgsLayerTreeRegistryBridge::layersWillBeRemoved( QStringList layerIds )
if ( !mEnabled )
return;
// when we start removing child nodes, the bridge would try to remove those layers from
// the registry _again_ in groupRemovedChildren() - this prevents it
mRegistryRemovingLayers = true;
foreach ( QString layerId, layerIds )
{
QgsLayerTreeLayer* nodeLayer = mRoot->findLayer( layerId );
if ( nodeLayer )
qobject_cast<QgsLayerTreeGroup*>( nodeLayer->parent() )->removeChildNode( nodeLayer );
}
mRegistryRemovingLayers = false;
}
@ -101,6 +108,9 @@ static void _collectLayerIdsInGroup( QgsLayerTreeGroup* group, int indexFrom, in
void QgsLayerTreeRegistryBridge::groupWillRemoveChildren( QgsLayerTreeNode* node, int indexFrom, int indexTo )
{
if ( mRegistryRemovingLayers )
return; // do not try to remove those layers again
Q_ASSERT( mLayerIdsForRemoval.isEmpty() );
Q_ASSERT( QgsLayerTree::isGroup( node ) );
@ -111,6 +121,9 @@ void QgsLayerTreeRegistryBridge::groupWillRemoveChildren( QgsLayerTreeNode* node
void QgsLayerTreeRegistryBridge::groupRemovedChildren()
{
if ( mRegistryRemovingLayers )
return; // do not try to remove those layers again
// remove only those that really do not exist in the tree
// (ignores layers that were dragged'n'dropped: 1. drop new 2. remove old)
QStringList toRemove;

1
src/core/layertree/qgslayertreeregistrybridge.h
View File

@ -64,6 +64,7 @@ class CORE_EXPORT QgsLayerTreeRegistryBridge : public QObject
protected:
QgsLayerTreeGroup* mRoot;
QStringList mLayerIdsForRemoval;
bool mRegistryRemovingLayers;
bool mEnabled;
bool mNewLayersVisible;