fix redirected wms capabilities requests

qgis · Mar 29, 2014 · 3e4e9e1 · 3e4e9e1
1 parent fe39578
commit 3e4e9e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/providers/wms/qgswmscapabilities.cpp b/src/providers/wms/qgswmscapabilities.cpp
@@ -1867,7 +1867,7 @@ bool QgsWmsCapabilitiesDownload::downloadCapabilities()
   connect( mCapabilitiesReply, SIGNAL( downloadProgress( qint64, qint64 ) ), this, SLOT( capabilitiesReplyProgress( qint64, qint64 ) ), Qt::DirectConnection );
 
   QEventLoop loop;
-  connect( mCapabilitiesReply, SIGNAL( finished() ), &loop, SLOT( quit() ) );
+  connect( this, SIGNAL( downloadFinished() ), &loop, SLOT( quit() ) );
   loop.exec( QEventLoop::ExcludeUserInputEvents );
 
   return mError.isEmpty();
@@ -1936,5 +1936,6 @@ void QgsWmsCapabilitiesDownload::capabilitiesReplyFinished()
 
   mCapabilitiesReply->deleteLater();
   mCapabilitiesReply = 0;
-}
 
+  emit downloadFinished();
+}
diff --git a/src/providers/wms/qgswmscapabilities.h b/src/providers/wms/qgswmscapabilities.h
@@ -690,6 +690,9 @@ class QgsWmsCapabilitiesDownload : public QObject
     /** \brief emit a signal to be caught by qgisapp and display a msg on status bar */
     void statusChanged( QString const &  theStatusQString );
 
+    /** \brief emit a signal once the download is finished */
+    void downloadFinished();
+
   protected slots:
     void capabilitiesReplyFinished();
     void capabilitiesReplyProgress( qint64, qint64 );