From 3e4e9e13d9151ea566fd5db9d34d62261423fe15 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Sat, 29 Mar 2014 14:31:36 +0100 Subject: [PATCH] fix redirected wms capabilities requests --- src/providers/wms/qgswmscapabilities.cpp | 5 +++-- src/providers/wms/qgswmscapabilities.h | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/providers/wms/qgswmscapabilities.cpp b/src/providers/wms/qgswmscapabilities.cpp index b2c6ee95de8..b618774a345 100644 --- 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 index 4dddf2f8af6..05c22237bb6 100644 --- 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 );