Skip to content

Commit 3e4e9e1

Browse files
committedMar 29, 2014
fix redirected wms capabilities requests
1 parent fe39578 commit 3e4e9e1

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed
 

‎src/providers/wms/qgswmscapabilities.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1867,7 +1867,7 @@ bool QgsWmsCapabilitiesDownload::downloadCapabilities()
18671867
connect( mCapabilitiesReply, SIGNAL( downloadProgress( qint64, qint64 ) ), this, SLOT( capabilitiesReplyProgress( qint64, qint64 ) ), Qt::DirectConnection );
18681868

18691869
QEventLoop loop;
1870-
connect( mCapabilitiesReply, SIGNAL( finished() ), &loop, SLOT( quit() ) );
1870+
connect( this, SIGNAL( downloadFinished() ), &loop, SLOT( quit() ) );
18711871
loop.exec( QEventLoop::ExcludeUserInputEvents );
18721872

18731873
return mError.isEmpty();
@@ -1936,5 +1936,6 @@ void QgsWmsCapabilitiesDownload::capabilitiesReplyFinished()
19361936

19371937
mCapabilitiesReply->deleteLater();
19381938
mCapabilitiesReply = 0;
1939-
}
19401939

1940+
emit downloadFinished();
1941+
}

‎src/providers/wms/qgswmscapabilities.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,9 @@ class QgsWmsCapabilitiesDownload : public QObject
690690
/** \brief emit a signal to be caught by qgisapp and display a msg on status bar */
691691
void statusChanged( QString const & theStatusQString );
692692

693+
/** \brief emit a signal once the download is finished */
694+
void downloadFinished();
695+
693696
protected slots:
694697
void capabilitiesReplyFinished();
695698
void capabilitiesReplyProgress( qint64, qint64 );

0 commit comments

Comments
 (0)
Please sign in to comment.