From b45f870925bda64877575e86864c74684e71ed12 Mon Sep 17 00:00:00 2001
From: jef <jef@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Sat, 12 Feb 2011 21:25:43 +0000
Subject: [PATCH] mapserver: fix crash when layer cache is to small for project

git-svn-id: http://svn.osgeo.org/qgis/trunk@15161 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 src/mapserver/qgsprojectparser.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
index 198202e2bf0..a6ccb63b59c 100644
--- a/src/mapserver/qgsprojectparser.cpp
+++ b/src/mapserver/qgsprojectparser.cpp
@@ -194,6 +194,13 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
     else if ( currentChildElem.tagName() == "legendlayer" )
     {
       QString id = layerIdFromLegendLayer( currentChildElem );
+
+      if ( !layerMap.contains( id ) )
+      {
+        QgsMSDebugMsg( QString( "layer %1 not found in map - layer cache to small?" ).arg( id ) );
+        continue;
+      }
+
       QgsMapLayer *currentLayer = layerMap[ id ];
       if ( !currentLayer )
       {
@@ -257,8 +264,7 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
       continue;
     }
 
-
-#if QGSMSDEBUG
+#if 0
     QString buf;
     QTextStream s( &buf );
     layerElem.save( s, 0 );