Fix loading of labeling from 2.x projects

qgis · May 16, 2017 · 56309ef · 56309ef
1 parent 53f8e7f
commit 56309ef
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
@@ -377,6 +377,10 @@ bool QgsMapLayer::readLayerXml( const QDomElement &layerElement, const QgsReadWr
   savedValidation = QgsCoordinateReferenceSystem::customCrsValidation();
   QgsCoordinateReferenceSystem::setCustomCrsValidation( nullptr );
 
+  // read custom properties before passing reading further to a subclass, so that
+  // the subclass can also read custom properties
+  readCustomProperties( layerElement );
+
   // now let the children grab what they need from the Dom node.
   layerError = !readXml( layerElement, context );
 
@@ -504,8 +508,6 @@ bool QgsMapLayer::readLayerXml( const QDomElement &layerElement, const QgsReadWr
   }
 #endif
 
-  readCustomProperties( layerElement );
-
   mMetadata.readFromLayer( this );
 
   return true;