Skip to content

Commit

Permalink
Merge pull request #9777 from mbernasocchi/fix_maxwmswidth
Browse files Browse the repository at this point in the history
[server] fix wmsMaxHeightEnv leftover code
  • Loading branch information
mbernasocchi committed Apr 12, 2019
2 parents 6092d56 + c1546d9 commit a0a8e49
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/server/services/wms/qgswmsrenderer.cpp
Expand Up @@ -1905,7 +1905,7 @@ namespace QgsWms
int wmsMaxHeightProj = QgsServerProjectUtils::wmsMaxHeight( *mProject );
int wmsMaxHeightEnv = mContext.settings().wmsMaxHeight();
int wmsMaxHeight;
if ( wmsMaxWidthEnv != -1 && wmsMaxWidthProj != -1 )
if ( wmsMaxHeightEnv != -1 && wmsMaxHeightProj != -1 )
{
// both are set, so we take the more conservative one
wmsMaxHeight = std::min( wmsMaxHeightProj, wmsMaxHeightEnv );
Expand Down

0 comments on commit a0a8e49

Please sign in to comment.