napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[libcalamares] Apply (some) options to request earlier

Browse Source
This commit is contained in:
Adriaan de Groot 2019-09-10 14:26:46 +02:00
parent 11d3f10e26
commit ca351ff7b6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libcalamares/network/Manager.cpp
View File

@ -111,6 +111,8 @@ static QNetworkReply*
asynchronousRun( const std::unique_ptr< QNetworkAccessManager >& nam, const QUrl& url, const RequestOptions& options ) asynchronousRun( const std::unique_ptr< QNetworkAccessManager >& nam, const QUrl& url, const RequestOptions& options )
{ {
QNetworkRequest request = QNetworkRequest( url ); QNetworkRequest request = QNetworkRequest( url );
options.applyToRequest( &request );
QNetworkReply* reply = nam->get( request ); QNetworkReply* reply = nam->get( request );
QTimer* timer = nullptr; QTimer* timer = nullptr;
@ -121,7 +123,6 @@ asynchronousRun( const std::unique_ptr< QNetworkAccessManager >& nam, const QUrl
return nullptr; return nullptr;
} }
options.applyToRequest( &request );
if ( options.hasTimeout() ) if ( options.hasTimeout() )
{ {
timer = new QTimer( reply ); timer = new QTimer( reply );