[bugfix] Layer rendering order broken in QGIS 3x

elpaso · elpaso · commit ca732051852f · 2018-04-05T12:09:41.000+02:00
Fixes #18620 Cherry-picked from master 958cb3d
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -1016,11 +1016,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
`@@ -1016,11 +1016,12 @@ bool QgsProject::readProjectFile( const QString &filename )`
`1016`	`1016`	`{`
`1017`	`1017`	`mRootGroup->readLayerOrderFromXml( layerTreeElem );`
`1018`	`1018`	`}`
`1019`		`- else`
	`1019`	`+`
	`1020`	`+ // Load pre 3.0 configuration`
	`1021`	`+ QDomElement layerTreeCanvasElem = doc->documentElement().firstChildElement( QStringLiteral( "layer-tree-canvas" ) );`
	`1022`	`+ if ( !layerTreeCanvasElem.isNull( ) )`
`1020`	`1023`	`{`
`1021`		`- // Load pre 3.0 configuration`
`1022`		`- QDomElement elem = doc->documentElement().firstChildElement( QStringLiteral( "layer-tree-canvas" ) );`
`1023`		`- mRootGroup->readLayerOrderFromXml( elem );`
	`1024`	`+ mRootGroup->readLayerOrderFromXml( layerTreeCanvasElem );`
`1024`	`1025`	`}`
`1025`	`1026`
`1026`	`1027`	`// make sure the are just valid layers`