Fix for crash when removing a drawing composer map

mhugent · mhugent · commit e5a1b3db07c3 · 2009-08-16T10:18:34.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@11395 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
@@ -310,8 +310,12 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )
   {
     for ( ; itemIt != composerItemList.end(); ++itemIt )
     {
-      composition()->removeItem( *itemIt );
-      emit itemRemoved( *itemIt );
+      QgsComposerMap* map = dynamic_cast<QgsComposerMap*>( *itemIt );
+      if ( !map || !map->isDrawing() ) //don't delete a composer map while it draws
+      {
+        composition()->removeItem( *itemIt );
+        emit itemRemoved( *itemIt );
+      }
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -310,8 +310,12 @@ void QgsComposerView::keyPressEvent( QKeyEvent * e )`
`310`	`310`	`{`
`311`	`311`	`for ( ; itemIt != composerItemList.end(); ++itemIt )`
`312`	`312`	`{`
`313`		`- composition()->removeItem( *itemIt );`
`314`		`- emit itemRemoved( *itemIt );`
	`313`	`+ QgsComposerMap* map = dynamic_cast<QgsComposerMap>( itemIt );`
	`314`	`+ if ( !map \|\| !map->isDrawing() ) //don't delete a composer map while it draws`
	`315`	`+ {`
	`316`	`+ composition()->removeItem( *itemIt );`
	`317`	`+ emit itemRemoved( *itemIt );`
	`318`	`+ }`
`315`	`319`	`}`
`316`	`320`	`}`
`317`	`321`