Fix wmsserver: Do not manipulate maplayerregistry directly

qgis · May 17, 2013 · df19fe5 · df19fe5
1 parent 55556fc
commit df19fe5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -373,7 +373,7 @@ QImage* QgsWMSServer::getLegendGraphics()
     currentY += layerSpace;
   }
 
-  QgsMapLayerRegistry::instance()->mapLayers().clear();
+  QgsMapLayerRegistry::instance()->removeAllMapLayers();
   delete theImage;
   return paintImage;
 }
@@ -649,7 +649,7 @@ QImage* QgsWMSServer::getMap()
   clearFeatureSelections( selectedLayerIdList );
 
   QgsDebugMsg( "clearing filters" );
-  QgsMapLayerRegistry::instance()->mapLayers().clear();
+  QgsMapLayerRegistry::instance()->removeAllMapLayers();
 
 #ifdef QGISDEBUG
   theImage->save( QDir::tempPath() + QDir::separator() + "lastrender.png" );
@@ -1926,7 +1926,7 @@ QStringList QgsWMSServer::applyFeatureSelections( const QStringList& layerList )
 
 void QgsWMSServer::clearFeatureSelections( const QStringList& layerIds ) const
 {
-  QMap<QString, QgsMapLayer*>& layerMap = QgsMapLayerRegistry::instance()->mapLayers();
+  const QMap<QString, QgsMapLayer*>& layerMap = QgsMapLayerRegistry::instance()->mapLayers();
 
   foreach ( QString id, layerIds )
   {