Merge pull request #6751 from elpaso/bugfix-18620-layer-custom-order

elpaso · web-flow · commit 16e18ba6234b · 2018-04-05T12:08:22.000+02:00
[bugfix] Layer rendering order broken in QGIS 3x
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -1077,11 +1077,12 @@ bool QgsProject::readProjectFile( const QString &filename )
   {
     mRootGroup->readLayerOrderFromXml( layerTreeElem );
   }
-  else
+
+  // Load pre 3.0 configuration
+  QDomElement layerTreeCanvasElem = doc->documentElement().firstChildElement( QStringLiteral( "layer-tree-canvas" ) );
+  if ( !layerTreeCanvasElem.isNull( ) )
   {
-    // Load pre 3.0 configuration
-    QDomElement elem = doc->documentElement().firstChildElement( QStringLiteral( "layer-tree-canvas" ) );
-    mRootGroup->readLayerOrderFromXml( elem );
+    mRootGroup->readLayerOrderFromXml( layerTreeCanvasElem );
   }
 
   // make sure the are just valid layers

Original file line number	Diff line number	Diff line change
`@@ -1077,11 +1077,12 @@ bool QgsProject::readProjectFile( const QString &filename )`
`1077`	`1077`	`{`
`1078`	`1078`	`mRootGroup->readLayerOrderFromXml( layerTreeElem );`
`1079`	`1079`	`}`
`1080`		`- else`
	`1080`	`+`
	`1081`	`+ // Load pre 3.0 configuration`
	`1082`	`+ QDomElement layerTreeCanvasElem = doc->documentElement().firstChildElement( QStringLiteral( "layer-tree-canvas" ) );`
	`1083`	`+ if ( !layerTreeCanvasElem.isNull( ) )`
`1081`	`1084`	`{`
`1082`		`- // Load pre 3.0 configuration`
`1083`		`- QDomElement elem = doc->documentElement().firstChildElement( QStringLiteral( "layer-tree-canvas" ) );`
`1084`		`- mRootGroup->readLayerOrderFromXml( elem );`
	`1085`	`+ mRootGroup->readLayerOrderFromXml( layerTreeCanvasElem );`
`1085`	`1086`	`}`
`1086`	`1087`
`1087`	`1088`	`// make sure the are just valid layers`