@@ -1517,7 +1517,7 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
15171517 else
15181518 {
15191519 layerElement = result.createElement ( " Layer" );
1520- QString layerName = mConfigParser ->useLayerIDs () ? currentLayer->id () : currentLayer->name ();
1520+ QString layerName = mConfigParser && mConfigParser ->useLayerIDs () ? currentLayer->id () : currentLayer->name ();
15211521
15221522 // check if the layer is given a different name for GetFeatureInfo output
15231523 QHash<QString, QString>::const_iterator layerAliasIt = layerAliasMap.find ( layerName );
@@ -2068,7 +2068,7 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
20682068 {
20692069 bool withGeom = layer->wkbType () != QGis::WKBNoGeometry && addWktGeometry;
20702070 int version = infoFormat.startsWith ( " application/vnd.ogc.gml/3" ) ? 3 : 2 ;
2071- QDomElement elem = createFeatureGML ( &feature, layer, infoDocument, outputCrs, mConfigParser ->useLayerIDs () ? layer->id () : layer->name (), withGeom, version );
2071+ QDomElement elem = createFeatureGML ( &feature, layer, infoDocument, outputCrs, mConfigParser && mConfigParser ->useLayerIDs () ? layer->id () : layer->name (), withGeom, version );
20722072 QDomElement featureMemberElem = infoDocument.createElement ( " gml:featureMember" /* wfs:FeatureMember*/ );
20732073 featureMemberElem.appendChild ( elem );
20742074 layerElement.appendChild ( featureMemberElem );
@@ -2202,7 +2202,7 @@ int QgsWMSServer::featureInfoFromRasterLayer( QgsRasterLayer* layer,
22022202
22032203 QgsCoordinateReferenceSystem layerCrs = layer->crs ();
22042204 int version = infoFormat.startsWith ( " application/vnd.ogc.gml/3" ) ? 3 : 2 ;
2205- QDomElement elem = createFeatureGML ( &feature, 0 , infoDocument, layerCrs, mConfigParser ->useLayerIDs () ? layer->id () : layer->name (), false , version );
2205+ QDomElement elem = createFeatureGML ( &feature, 0 , infoDocument, layerCrs, mConfigParser && mConfigParser ->useLayerIDs () ? layer->id () : layer->name (), false , version );
22062206 layerElement.appendChild ( elem );
22072207 }
22082208 else
@@ -2254,7 +2254,7 @@ QStringList QgsWMSServer::layerSet( const QStringList &layersList,
22542254 theMapLayer = layerList.at ( listIndex );
22552255 if ( theMapLayer )
22562256 {
2257- QgsDebugMsg ( QString ( " Checking layer: %1" ).arg ( mConfigParser ->useLayerIDs () ? theMapLayer->id () : theMapLayer->name () ) );
2257+ QgsDebugMsg ( QString ( " Checking layer: %1" ).arg ( mConfigParser && mConfigParser ->useLayerIDs () ? theMapLayer->id () : theMapLayer->name () ) );
22582258 // test if layer is visible in requested scale
22592259 bool useScaleConstraint = ( scaleDenominator > 0 && theMapLayer->hasScaleBasedVisibility () );
22602260 if ( !useScaleConstraint ||
@@ -2317,7 +2317,7 @@ QMap<QString, QString> QgsWMSServer::applyRequestedLayerFilters( const QStringLi
23172317
23182318 foreach ( QgsMapLayer *layer, QgsMapLayerRegistry::instance ()->mapLayers () )
23192319 {
2320- if ( layer && ( mConfigParser ->useLayerIDs () ? layer->id () : layer->name () ) == eqSplit.at ( 0 ) )
2320+ if ( layer && ( mConfigParser && mConfigParser ->useLayerIDs () ? layer->id () : layer->name () ) == eqSplit.at ( 0 ) )
23212321 {
23222322 layersToFilter.push_back ( layer );
23232323 }
@@ -2542,7 +2542,7 @@ QStringList QgsWMSServer::applyFeatureSelections( const QStringList& layerList )
25422542
25432543 foreach ( QgsMapLayer *layer, QgsMapLayerRegistry::instance ()->mapLayers () )
25442544 {
2545- if ( layer && ( mConfigParser ->useLayerIDs () ? layer->id () : layer->name () ) == layerName )
2545+ if ( layer && ( mConfigParser && mConfigParser ->useLayerIDs () ? layer->id () : layer->name () ) == layerName )
25462546 {
25472547 vLayer = qobject_cast<QgsVectorLayer*>( layer );
25482548 layersWithSelections.push_back ( vLayer->id () );
0 commit comments