don't overwrite wms error messages

jef · jef · commit ec89f4906c4e · 2010-12-16T15:42:52.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@14928 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -849,6 +849,8 @@ bool QgsWmsProvider::retrieveServerCapabilities( bool forceRefresh )
   {
     QString url = mBaseUrl + "SERVICE=WMS&REQUEST=GetCapabilities";
 
+    mError = "";
+
     QNetworkRequest request( url );
     request.setAttribute( QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork );
     request.setAttribute( QNetworkRequest::CacheSaveControlAttribute, true );
@@ -866,8 +868,11 @@ bool QgsWmsProvider::retrieveServerCapabilities( bool forceRefresh )
 
     if ( httpcapabilitiesresponse.isEmpty() )
     {
-      mErrorFormat = "text/plain";
-      mError = tr( "empty capabilities document" );
+      if ( mError.isEmpty() )
+      {
+        mErrorFormat = "text/plain";
+        mError = tr( "empty capabilities document" );
+      }
       return false;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -849,6 +849,8 @@ bool QgsWmsProvider::retrieveServerCapabilities( bool forceRefresh )`
`849`	`849`	`{`
`850`	`850`	`QString url = mBaseUrl + "SERVICE=WMS&REQUEST=GetCapabilities";`
`851`	`851`
	`852`	`+ mError = "";`
	`853`	`+`
`852`	`854`	`QNetworkRequest request( url );`
`853`	`855`	`request.setAttribute( QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferNetwork );`
`854`	`856`	`request.setAttribute( QNetworkRequest::CacheSaveControlAttribute, true );`
`@@ -866,8 +868,11 @@ bool QgsWmsProvider::retrieveServerCapabilities( bool forceRefresh )`
`866`	`868`
`867`	`869`	`if ( httpcapabilitiesresponse.isEmpty() )`
`868`	`870`	`{`
`869`		`- mErrorFormat = "text/plain";`
`870`		`- mError = tr( "empty capabilities document" );`
	`871`	`+ if ( mError.isEmpty() )`
	`872`	`+ {`
	`873`	`+ mErrorFormat = "text/plain";`
	`874`	`+ mError = tr( "empty capabilities document" );`
	`875`	`+ }`
`871`	`876`	`return false;`
`872`	`877`	`}`
`873`	`878`