[QGIS Commit] r14928 - trunk/qgis/src/providers/wms

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-12-16 07:42:52 -0800 (Thu, 16 Dec 2010)
New Revision: 14928

Modified:
   trunk/qgis/src/providers/wms/qgswmsprovider.cpp
Log:
don't overwrite wms error messages

Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-12-16 15:16:23 UTC (rev 14927)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-12-16 15:42:52 UTC (rev 14928)
@@ -849,6 +849,8 @@
   {
     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 @@
 
     if ( httpcapabilitiesresponse.isEmpty() )
     {
-      mErrorFormat = "text/plain";
-      mError = tr( "empty capabilities document" );
+      if ( mError.isEmpty() )
+      {
+        mErrorFormat = "text/plain";
+        mError = tr( "empty capabilities document" );
+      }
       return false;
     }