Don't crash if embedded group cannot be loaded (Fix #7872)

m-kuhn · m-kuhn · commit 8024df7c934e · 2013-06-12T16:26:16.000+02:00
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
@@ -1845,11 +1845,14 @@ bool QgsLegend::readXML( QgsLegendGroup *parent, const QDomNode &node )
       if ( childelem.attribute( "embedded" ) == "1" )
       {
         theGroup = addEmbeddedGroup( name, QgsProject::instance()->readPath( childelem.attribute( "project" ) ) );
-        if ( childelem.hasAttribute( "drawingOrder" ) )
+        if ( theGroup )
         {
-          theGroup->setDrawingOrder( childelem.attribute( "drawingOrder" ).toInt() );
+          if ( childelem.hasAttribute( "drawingOrder" ) )
+          {
+            theGroup->setDrawingOrder( childelem.attribute( "drawingOrder" ).toInt() );
+          }
+          updateGroupCheckStates( theGroup );
         }
-        updateGroupCheckStates( theGroup );
       }
       else
       {

Original file line number	Diff line number	Diff line change
`@@ -1845,11 +1845,14 @@ bool QgsLegend::readXML( QgsLegendGroup *parent, const QDomNode &node )`
`1845`	`1845`	`if ( childelem.attribute( "embedded" ) == "1" )`
`1846`	`1846`	`{`
`1847`	`1847`	`theGroup = addEmbeddedGroup( name, QgsProject::instance()->readPath( childelem.attribute( "project" ) ) );`
`1848`		`- if ( childelem.hasAttribute( "drawingOrder" ) )`
	`1848`	`+ if ( theGroup )`
`1849`	`1849`	`{`
`1850`		`- theGroup->setDrawingOrder( childelem.attribute( "drawingOrder" ).toInt() );`
	`1850`	`+ if ( childelem.hasAttribute( "drawingOrder" ) )`
	`1851`	`+ {`
	`1852`	`+ theGroup->setDrawingOrder( childelem.attribute( "drawingOrder" ).toInt() );`
	`1853`	`+ }`
	`1854`	`+ updateGroupCheckStates( theGroup );`
`1851`	`1855`	`}`
`1852`		`- updateGroupCheckStates( theGroup );`
`1853`	`1856`	`}`
`1854`	`1857`	`else`
`1855`	`1858`	`{`