Mercurial Repositories > eric / file diff

--- a/WebBrowser/Network/NetworkManager.py	Sun Oct 21 14:22:31 2018 +0200
+++ b/WebBrowser/Network/NetworkManager.py	Sun Oct 21 18:42:53 2018 +0200
@@ -54,11 +54,14 @@
             from E5Network.E5NetworkProxyFactory import E5NetworkProxyFactory
             
             self.__proxyFactory = E5NetworkProxyFactory()
-            QNetworkProxyFactory.setApplicationProxyFactory(
-                self.__proxyFactory)
-            
-            QNetworkProxyFactory.setUseSystemConfiguration(
-                Preferences.getUI("UseSystemProxy"))
+            if Preferences.getUI("UseSystemProxy"):
+                QNetworkProxyFactory.setApplicationProxyFactory(
+                    QNetworkProxyFactory())
+                QNetworkProxyFactory.setUseSystemConfiguration(True)
+            else:
+                QNetworkProxyFactory.setApplicationProxyFactory(
+                    self.__proxyFactory)
+                QNetworkProxyFactory.setUseSystemConfiguration(False)
         
         self.languagesChanged()
         
@@ -340,8 +343,14 @@
         self.__interceptor.preferencesChanged()
             
         if not WebBrowserWindow._fromEric:
-            QNetworkProxyFactory.setUseSystemConfiguration(
-                Preferences.getUI("UseSystemProxy"))
+            if Preferences.getUI("UseSystemProxy"):
+                QNetworkProxyFactory.setApplicationProxyFactory(
+                    QNetworkProxyFactory())
+                QNetworkProxyFactory.setUseSystemConfiguration(True)
+            else:
+                QNetworkProxyFactory.setApplicationProxyFactory(
+                    self.__proxyFactory)
+                QNetworkProxyFactory.setUseSystemConfiguration(False)
     
     def createRequest(self, op, request, data):
         """