@@ -6221,40 +6221,50 @@ void QgisApp::namUpdate()
6221
6221
{
6222
6222
QSettings settings;
6223
6223
6224
- // read type, host, port, user, passw from settings
6225
- QString proxyHost = settings.value ( " proxy/proxyHost" , " " ).toString ();
6226
- int proxyPort = settings.value ( " proxy/proxyPort" , " " ).toString ().toInt ();
6227
- QString proxyUser = settings.value ( " proxy/proxyUser" , " " ).toString ();
6228
- QString proxyPassword = settings.value ( " proxy/proxyPassword" , " " ).toString ();
6229
-
6230
- QString proxyTypeString = settings.value ( " proxy/proxyType" , " " ).toString ();
6231
- QNetworkProxy::ProxyType proxyType = QNetworkProxy::NoProxy;
6232
- if ( proxyTypeString == " DefaultProxy" )
6233
- {
6234
- proxyType = QNetworkProxy::DefaultProxy;
6235
- }
6236
- else if ( proxyTypeString == " Socks5Proxy" )
6237
- {
6238
- proxyType = QNetworkProxy::Socks5Proxy;
6239
- }
6240
- else if ( proxyTypeString == " HttpProxy" )
6224
+ // check if proxy is enabled
6225
+ bool proxyEnabled = settings.value ( " proxy/proxyEnabled" , false ).toBool ();
6226
+ if ( proxyEnabled )
6241
6227
{
6242
- proxyType = QNetworkProxy::HttpProxy;
6243
- }
6244
- else if ( proxyTypeString == " HttpCachingProxy" )
6245
- {
6246
- proxyType = QNetworkProxy::HttpCachingProxy;
6228
+
6229
+ // read type, host, port, user, passw from settings
6230
+ QString proxyHost = settings.value ( " proxy/proxyHost" , " " ).toString ();
6231
+ int proxyPort = settings.value ( " proxy/proxyPort" , " " ).toString ().toInt ();
6232
+ QString proxyUser = settings.value ( " proxy/proxyUser" , " " ).toString ();
6233
+ QString proxyPassword = settings.value ( " proxy/proxyPassword" , " " ).toString ();
6234
+
6235
+ QString proxyTypeString = settings.value ( " proxy/proxyType" , " " ).toString ();
6236
+ QNetworkProxy::ProxyType proxyType = QNetworkProxy::NoProxy;
6237
+ if ( proxyTypeString == " DefaultProxy" )
6238
+ {
6239
+ proxyType = QNetworkProxy::DefaultProxy;
6240
+ }
6241
+ else if ( proxyTypeString == " Socks5Proxy" )
6242
+ {
6243
+ proxyType = QNetworkProxy::Socks5Proxy;
6244
+ }
6245
+ else if ( proxyTypeString == " HttpProxy" )
6246
+ {
6247
+ proxyType = QNetworkProxy::HttpProxy;
6248
+ }
6249
+ else if ( proxyTypeString == " HttpCachingProxy" )
6250
+ {
6251
+ proxyType = QNetworkProxy::HttpCachingProxy;
6252
+ }
6253
+ else if ( proxyTypeString == " FtpCachingProxy" )
6254
+ {
6255
+ proxyType = QNetworkProxy::FtpCachingProxy;
6256
+ }
6257
+ QgsDebugMsg ( QString ( " setting proxy %1 %2:%3 %4/%5" )
6258
+ .arg ( proxyType )
6259
+ .arg ( proxyHost ).arg ( proxyPort )
6260
+ .arg ( proxyUser ).arg ( proxyPassword )
6261
+ );
6262
+ nam ()->setProxy ( QNetworkProxy ( proxyType, proxyHost, proxyPort, proxyUser, proxyPassword ) );
6247
6263
}
6248
- else if ( proxyTypeString == " FtpCachingProxy " )
6264
+ else
6249
6265
{
6250
- proxyType = QNetworkProxy::FtpCachingProxy ;
6266
+ nam ()-> setProxy ( QNetworkProxy () ) ;
6251
6267
}
6252
- QgsDebugMsg ( QString ( " setting proxy %1 %2:%3 %4/%5" )
6253
- .arg ( proxyType )
6254
- .arg ( proxyHost ).arg ( proxyPort )
6255
- .arg ( proxyUser ).arg ( proxyPassword )
6256
- );
6257
- nam ()->setProxy ( QNetworkProxy ( proxyType, proxyHost, proxyPort, proxyUser, proxyPassword ) );
6258
6268
6259
6269
QNetworkDiskCache *cache = qobject_cast<QNetworkDiskCache*>( nam ()->cache () );
6260
6270
if ( !cache )
0 commit comments