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

qgis · Jun 12, 2013 · 8024df7c934eb9ae159f51ffc0653e8677cb2aff · 8024df7
1 parent b3d184d
commit 8024df7c934eb9ae159f51ffc0653e8677cb2aff
Unified Split

Showing with 6 additions and 3 deletions.

+6 −3 src/app/legend/qgslegend.cpp
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
       {