Follow up 0bda714

Ensure that mLegendFilterByMap is set before setting the map when reading legend xml
qgis · Oct 21, 2014 · 2b36dea1f75f735f813a170be38a737e96346fb5 · 2b36dea
1 parent 0bda714
commit 2b36dea1f75f735f813a170be38a737e96346fb5
Unified Split

Showing with 1 addition and 2 deletions.

+1 −2 src/core/composer/qgscomposerlegend.cpp
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
@@ -353,6 +353,7 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument
   mSettings.setWrapChar( itemElem.attribute( "wrapChar" ) );
 
   //composer map
+  mLegendFilterByMap = itemElem.attribute( "legendFilterByMap", "0" ).toInt();
   if ( !itemElem.attribute( "map" ).isEmpty() )
   {
     setComposerMap( mComposition->getComposerMapById( itemElem.attribute( "map" ).toInt() ) );
@@ -369,8 +370,6 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument
     _readXML( composerItemElem, doc );
   }
 
-  mLegendFilterByMap = itemElem.attribute( "legendFilterByMap", "0" ).toInt();
-
   // < 2.0 projects backward compatibility >>>>>
   //title font
   QString titleFontString = itemElem.attribute( "titleFont" );