Fix crash when project has no groups and project OWS name equals to

elpaso · elpaso · commit 2ecf0feeb9a7 · 2019-04-05T18:40:22.000+02:00
... first layer short name

Manually backported from master
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -3497,9 +3497,19 @@ namespace QgsWms
       QStringList _result;
       if ( mLayerGroups.contains( name ) )
       {
-        for ( const auto &l : mLayerGroups[ name ] )
+        const auto &layers  { mLayerGroups[ name ] };
+        for ( const auto &l : layers )
         {
-          _result.append( findLeaves( l->shortName().isEmpty() ? l->name() : l->shortName() ) );
+          const auto nick { layerNickname( *l ) };
+          // This handles the case for root (fake) group
+          if ( mLayerGroups.contains( nick ) )
+          {
+            _result.append( name );
+          }
+          else
+          {
+            _result.append( findLeaves( nick ) );
+          }
         }
       }
       else
@@ -3508,7 +3518,8 @@ namespace QgsWms
       }
       return _result;
     };
-    for ( const auto &name : mWmsParameters.queryLayersNickname() )
+    const auto constNicks { mWmsParameters.queryLayersNickname() };
+    for ( const auto &name : constNicks )
     {
       result.append( findLeaves( name ) );
     }

Original file line number	Diff line number	Diff line change
`@@ -3497,9 +3497,19 @@ namespace QgsWms`
`3497`	`3497`	`QStringList _result;`
`3498`	`3498`	`if ( mLayerGroups.contains( name ) )`
`3499`	`3499`	`{`
`3500`		`- for ( const auto &l : mLayerGroups[ name ] )`
	`3500`	`+ const auto &layers { mLayerGroups[ name ] };`
	`3501`	`+ for ( const auto &l : layers )`
`3501`	`3502`	`{`
`3502`		`- _result.append( findLeaves( l->shortName().isEmpty() ? l->name() : l->shortName() ) );`
	`3503`	`+ const auto nick { layerNickname( *l ) };`
	`3504`	`+ // This handles the case for root (fake) group`
	`3505`	`+ if ( mLayerGroups.contains( nick ) )`
	`3506`	`+ {`
	`3507`	`+ _result.append( name );`
	`3508`	`+ }`
	`3509`	`+ else`
	`3510`	`+ {`
	`3511`	`+ _result.append( findLeaves( nick ) );`
	`3512`	`+ }`
`3503`	`3513`	`}`
`3504`	`3514`	`}`
`3505`	`3515`	`else`
`@@ -3508,7 +3518,8 @@ namespace QgsWms`
`3508`	`3518`	`}`
`3509`	`3519`	`return _result;`
`3510`	`3520`	`};`
`3511`		`- for ( const auto &name : mWmsParameters.queryLayersNickname() )`
	`3521`	`+ const auto constNicks { mWmsParameters.queryLayersNickname() };`
	`3522`	`+ for ( const auto &name : constNicks )`
`3512`	`3523`	`{`
`3513`	`3524`	`result.append( findLeaves( name ) );`
`3514`	`3525`	`}`