[server] Fix some exceptions were not correctly restoring layer opacity

nyalldawson · nyalldawson · commit 173c7d7814b5 · 2016-02-22T11:06:53.000+11:00
diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp
@@ -1286,6 +1286,7 @@ QByteArray* QgsWMSServer::getPrint( const QString& formatString )
   QgsComposition* c = mConfigParser->createPrintComposition( mParameters[ "TEMPLATE" ], mMapRenderer, QMap<QString, QString>( mParameters ) );
   if ( !c )
   {
+    restoreOpacities( bkVectorRenderers, bkRasterRenderers, labelTransparencies, labelBufferTransparencies );
     clearFeatureSelections( selectedLayerIdList );
     return nullptr;
   }
@@ -1334,6 +1335,7 @@ QByteArray* QgsWMSServer::getPrint( const QString& formatString )
     if ( !tempFile.open() )
     {
       delete c;
+      restoreOpacities( bkVectorRenderers, bkRasterRenderers, labelTransparencies, labelBufferTransparencies );
       clearFeatureSelections( selectedLayerIdList );
       return nullptr;
     }
@@ -1344,6 +1346,7 @@ QByteArray* QgsWMSServer::getPrint( const QString& formatString )
   }
   else //unknown format
   {
+    restoreOpacities( bkVectorRenderers, bkRasterRenderers, labelTransparencies, labelBufferTransparencies );
     clearFeatureSelections( selectedLayerIdList );
     throw QgsMapServiceException( "InvalidFormat", "Output format '" + formatString + "' is not supported in the GetPrint request" );
   }

Original file line number	Diff line number	Diff line change
`@@ -1286,6 +1286,7 @@ QByteArray* QgsWMSServer::getPrint( const QString& formatString )`
`1286`	`1286`	`QgsComposition* c = mConfigParser->createPrintComposition( mParameters[ "TEMPLATE" ], mMapRenderer, QMap<QString, QString>( mParameters ) );`
`1287`	`1287`	`if ( !c )`
`1288`	`1288`	`{`
	`1289`	`+ restoreOpacities( bkVectorRenderers, bkRasterRenderers, labelTransparencies, labelBufferTransparencies );`
`1289`	`1290`	`clearFeatureSelections( selectedLayerIdList );`
`1290`	`1291`	`return nullptr;`
`1291`	`1292`	`}`
`@@ -1334,6 +1335,7 @@ QByteArray* QgsWMSServer::getPrint( const QString& formatString )`
`1334`	`1335`	`if ( !tempFile.open() )`
`1335`	`1336`	`{`
`1336`	`1337`	`delete c;`
	`1338`	`+ restoreOpacities( bkVectorRenderers, bkRasterRenderers, labelTransparencies, labelBufferTransparencies );`
`1337`	`1339`	`clearFeatureSelections( selectedLayerIdList );`
`1338`	`1340`	`return nullptr;`
`1339`	`1341`	`}`
`@@ -1344,6 +1346,7 @@ QByteArray* QgsWMSServer::getPrint( const QString& formatString )`
`1344`	`1346`	`}`
`1345`	`1347`	`else //unknown format`
`1346`	`1348`	`{`
	`1349`	`+ restoreOpacities( bkVectorRenderers, bkRasterRenderers, labelTransparencies, labelBufferTransparencies );`
`1347`	`1350`	`clearFeatureSelections( selectedLayerIdList );`
`1348`	`1351`	`throw QgsMapServiceException( "InvalidFormat", "Output format '" + formatString + "' is not supported in the GetPrint request" );`
`1349`	`1352`	`}`