[composer] Fix crash when loading project

nyalldawson · nyalldawson · commit 0b213b6f403f · 2014-08-18T20:04:28.000+10:00
diff --git a/src/core/composer/qgscomposermapoverview.cpp b/src/core/composer/qgscomposermapoverview.cpp
@@ -203,7 +203,7 @@ void QgsComposerMapOverview::setFrameMap( const int mapId )
   }
 
   //disconnect old map
-  if ( mFrameMapId != -1 && mComposerMap->composition() )
+  if ( mFrameMapId != -1 && mComposerMap && mComposerMap->composition() )
   {
     const QgsComposerMap* map = mComposerMap->composition()->getComposerMapById( mFrameMapId );
     if ( map )
@@ -218,6 +218,11 @@ void QgsComposerMapOverview::setFrameMap( const int mapId )
 
 void QgsComposerMapOverview::connectSignals()
 {
+  if ( !mComposerMap )
+  {
+    return;
+  }
+
   if ( mFrameMapId != -1 && mComposerMap->composition() )
   {
     const QgsComposerMap* map = mComposerMap->composition()->getComposerMapById( mFrameMapId );
@@ -258,7 +263,7 @@ void QgsComposerMapOverview::overviewExtentChanged()
   }
 
   //if using overview centering, update the map's extent
-  if ( mComposerMap && mComposerMap->composition() && mCentered && mFrameMapId != -1 )
+  if ( mComposerMap->composition() && mCentered && mFrameMapId != -1 )
   {
     QgsRectangle extent = *mComposerMap->currentMapExtent();
 
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -1057,8 +1057,9 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
     QgsComposerMap* map = ( *mit );
     if ( map )
     {
-      QList<QgsComposerMapOverview* >::iterator overviewIt = map->mapOverviews().begin();
-      for ( ; overviewIt != map->mapOverviews().end(); ++overviewIt )
+      QList<QgsComposerMapOverview* > overviews = map->mapOverviews();
+      QList<QgsComposerMapOverview* >::iterator overviewIt = overviews.begin();
+      for ( ; overviewIt != overviews.end(); ++overviewIt )
       {
         ( *overviewIt )->connectSignals();
       }

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ void QgsComposerMapOverview::setFrameMap( const int mapId )`
`203`	`203`	`}`
`204`	`204`
`205`	`205`	`//disconnect old map`
`206`		`- if ( mFrameMapId != -1 && mComposerMap->composition() )`
	`206`	`+ if ( mFrameMapId != -1 && mComposerMap && mComposerMap->composition() )`
`207`	`207`	`{`
`208`	`208`	`const QgsComposerMap* map = mComposerMap->composition()->getComposerMapById( mFrameMapId );`
`209`	`209`	`if ( map )`
`@@ -218,6 +218,11 @@ void QgsComposerMapOverview::setFrameMap( const int mapId )`
`218`	`218`
`219`	`219`	`void QgsComposerMapOverview::connectSignals()`
`220`	`220`	`{`
	`221`	`+ if ( !mComposerMap )`
	`222`	`+ {`
	`223`	`+ return;`
	`224`	`+ }`
	`225`	`+`
`221`	`226`	`if ( mFrameMapId != -1 && mComposerMap->composition() )`
`222`	`227`	`{`
`223`	`228`	`const QgsComposerMap* map = mComposerMap->composition()->getComposerMapById( mFrameMapId );`
`@@ -258,7 +263,7 @@ void QgsComposerMapOverview::overviewExtentChanged()`
`258`	`263`	`}`
`259`	`264`
`260`	`265`	`//if using overview centering, update the map's extent`
`261`		`- if ( mComposerMap && mComposerMap->composition() && mCentered && mFrameMapId != -1 )`
	`266`	`+ if ( mComposerMap->composition() && mCentered && mFrameMapId != -1 )`
`262`	`267`	`{`
`263`	`268`	`QgsRectangle extent = *mComposerMap->currentMapExtent();`
`264`	`269`
Original file line number	Diff line number	Diff line change
`@@ -1057,8 +1057,9 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen`
`1057`	`1057`	`QgsComposerMap* map = ( *mit );`
`1058`	`1058`	`if ( map )`
`1059`	`1059`	`{`
`1060`		`- QList<QgsComposerMapOverview* >::iterator overviewIt = map->mapOverviews().begin();`
`1061`		`- for ( ; overviewIt != map->mapOverviews().end(); ++overviewIt )`
	`1060`	`+ QList<QgsComposerMapOverview* > overviews = map->mapOverviews();`
	`1061`	`+ QList<QgsComposerMapOverview* >::iterator overviewIt = overviews.begin();`
	`1062`	`+ for ( ; overviewIt != overviews.end(); ++overviewIt )`
`1062`	`1063`	`{`
`1063`	`1064`	`( *overviewIt )->connectSignals();`
`1064`	`1065`	`}`