Don't assume qobject_cast works on objects currently being deleted

m-kuhn · m-kuhn · commit dd715b233b4d · 2016-07-04T00:20:00.000+02:00
diff --git a/src/core/qgsmaplayerregistry.cpp b/src/core/qgsmaplayerregistry.cpp
@@ -151,11 +151,11 @@ void QgsMapLayerRegistry::removeMapLayers( const QList<QgsMapLayer*>& layers )
     QString myId( lyr->id() );
     emit layerWillBeRemoved( myId );
     emit layerWillBeRemoved( lyr );
+    mMapLayers.remove( myId );
     if ( lyr->parent() == this )
     {
       delete lyr;
     }
-    mMapLayers.remove( myId );
     emit layerRemoved( myId );
   }
 
@@ -192,10 +192,7 @@ void QgsMapLayerRegistry::reloadAllLayers()
 
 void QgsMapLayerRegistry::onMapLayerDeleted( QObject* obj )
 {
-  QgsMapLayer* ml = qobject_cast<QgsMapLayer*>( obj );
-  Q_ASSERT( ml );
-
-  QString id = mMapLayers.key( ml );
+  QString id = mMapLayers.key( static_cast<QgsMapLayer*>( obj ) );
 
   if ( !id.isNull() )
   {

Original file line number	Diff line number	Diff line change
`@@ -151,11 +151,11 @@ void QgsMapLayerRegistry::removeMapLayers( const QList<QgsMapLayer*>& layers )`
`151`	`151`	`QString myId( lyr->id() );`
`152`	`152`	`emit layerWillBeRemoved( myId );`
`153`	`153`	`emit layerWillBeRemoved( lyr );`
	`154`	`+ mMapLayers.remove( myId );`
`154`	`155`	`if ( lyr->parent() == this )`
`155`	`156`	`{`
`156`	`157`	`delete lyr;`
`157`	`158`	`}`
`158`		`- mMapLayers.remove( myId );`
`159`	`159`	`emit layerRemoved( myId );`
`160`	`160`	`}`
`161`	`161`
`@@ -192,10 +192,7 @@ void QgsMapLayerRegistry::reloadAllLayers()`
`192`	`192`
`193`	`193`	`void QgsMapLayerRegistry::onMapLayerDeleted( QObject* obj )`
`194`	`194`	`{`
`195`		`- QgsMapLayer* ml = qobject_cast<QgsMapLayer*>( obj );`
`196`		`- Q_ASSERT( ml );`
`197`		`-`
`198`		`- QString id = mMapLayers.key( ml );`
	`195`	`+ QString id = mMapLayers.key( static_cast<QgsMapLayer*>( obj ) );`
`199`	`196`
`200`	`197`	`if ( !id.isNull() )`
`201`	`198`	`{`