fix crash when connecting layerOrderChanged signal

3nids · web-flow · commit 4668d226ebc6 · 2018-10-29T13:48:59.000-04:00
diff --git a/src/core/layertree/qgslayertree.cpp b/src/core/layertree/qgslayertree.cpp
@@ -20,7 +20,7 @@
 QgsLayerTree::QgsLayerTree()
 {
   connect( this, &QgsLayerTree::addedChildren, this, &QgsLayerTree::nodeAddedChildren );
-  connect( this, &QgsLayerTree::removedChildren, this, &QgsLayerTree::nodeRemovedChildren );
+  connect( this, &QgsLayerTree::willRemoveChildren, this, &QgsLayerTree::nodeRemovedChildren );
 }
 
 QgsLayerTree::QgsLayerTree( const QgsLayerTree &other )
@@ -29,7 +29,7 @@ QgsLayerTree::QgsLayerTree( const QgsLayerTree &other )
   , mHasCustomLayerOrder( other.mHasCustomLayerOrder )
 {
   connect( this, &QgsLayerTree::addedChildren, this, &QgsLayerTree::nodeAddedChildren );
-  connect( this, &QgsLayerTree::removedChildren, this, &QgsLayerTree::nodeRemovedChildren );
+  connect( this, &QgsLayerTree::willRemoveChildren, this, &QgsLayerTree::nodeRemovedChildren );
 }
 
 QList<QgsMapLayer *> QgsLayerTree::customLayerOrder() const

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`QgsLayerTree::QgsLayerTree()`
`21`	`21`	`{`
`22`	`22`	`connect( this, &QgsLayerTree::addedChildren, this, &QgsLayerTree::nodeAddedChildren );`
`23`		`- connect( this, &QgsLayerTree::removedChildren, this, &QgsLayerTree::nodeRemovedChildren );`
	`23`	`+ connect( this, &QgsLayerTree::willRemoveChildren, this, &QgsLayerTree::nodeRemovedChildren );`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`QgsLayerTree::QgsLayerTree( const QgsLayerTree &other )`
`@@ -29,7 +29,7 @@ QgsLayerTree::QgsLayerTree( const QgsLayerTree &other )`
`29`	`29`	`, mHasCustomLayerOrder( other.mHasCustomLayerOrder )`
`30`	`30`	`{`
`31`	`31`	`connect( this, &QgsLayerTree::addedChildren, this, &QgsLayerTree::nodeAddedChildren );`
`32`		`- connect( this, &QgsLayerTree::removedChildren, this, &QgsLayerTree::nodeRemovedChildren );`
	`32`	`+ connect( this, &QgsLayerTree::willRemoveChildren, this, &QgsLayerTree::nodeRemovedChildren );`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`QList<QgsMapLayer *> QgsLayerTree::customLayerOrder() const`