Fix crash when closing a project with layers in edition (fixes #16771)

Delete layers from project & not through layers tree, avoiding double deletion of layers.
qgis · Aug 27, 2017 · 37052db · 37052db
1 parent 5e94546
commit 37052db
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -492,8 +492,6 @@ void QgsProject::clear()
   mMapThemeCollection.reset( new QgsMapThemeCollection( this ) );
   emit mapThemeCollectionChanged();
 
-  mRootGroup->clear();
-
   mLabelingEngineSettings->clear();
 
   mArchive->clear();
@@ -512,6 +510,8 @@ void QgsProject::clear()
   writeEntry( QStringLiteral( "Measurement" ), QStringLiteral( "/AreaUnits" ), s.value( QStringLiteral( "/qgis/measure/areaunits" ) ).toString() );
 
   removeAllMapLayers();
+  mRootGroup->clear();
+
   setDirty( false );
 }